Imported Upstream version 5.14.0.78

Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions

View File

@ -107,6 +107,12 @@ namespace System.ServiceModel.Channels.Http
if (m != null)
return m;
}
// Lastly, try to match the listener to the start of the current request path
// This is to support WCF methods with path parameters in UriTemplate annotation
m = listeners.FirstOrDefault (p => absolutePath.StartsWith (p.Key.AbsolutePath, StringComparison.Ordinal)).Value;
if (m != null)
return m;
}
if (m == null)
@ -119,7 +125,7 @@ namespace System.ServiceModel.Channels.Http
{
HttpListenerManager m;
if (ServiceHostingEnvironment.InAspNet)
if (ServiceHostingEnvironmentInternal.InAspNet)
m = new AspNetHttpListenerManager (uri);
else
m = new HttpStandaloneListenerManager (uri, element);