X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.ServiceModel%2FSystem.ServiceModel.Channels.Http%2FHttpChannelListenerEntry.cs;h=2cf8ba3870167e4c011075e0f2eb5bb4c54aeba1;hb=0a1e3ddf05121c7a43349babb5915db3eb1da4c6;hp=119b5b0a4798d71669d121e915624e6bea2ab4a8;hpb=a4d24d94bacfa0a9baa87ad82cc39a601e5ce937;p=mono.git

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListenerEntry.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListenerEntry.cs
index 119b5b0a479..2cf8ba38701 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListenerEntry.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpChannelListenerEntry.cs
@@ -69,14 +69,14 @@ namespace System.ServiceModel.Channels.Http
 			return p2 - p1;
 		}
 
-		const UriComponents cmpflag = UriComponents.HttpRequestUrl ^ UriComponents.Query;
+		const UriComponents cmpflag = UriComponents.Path;
 		const UriFormat fmtflag = UriFormat.SafeUnescaped;
 
 		internal bool FilterHttpContext (HttpContextInfo ctx)
 		{
 			if (ChannelDispatcher == null)
 				return true; // no mex can be involved.
-			if (ctx.HttpMethod.ToUpper () != "GET")
+			if (ctx.Request.HttpMethod.ToUpper () != "GET")
 				return !ChannelDispatcher.IsMex; // non-GET request never matches mex channel dispatcher.
 			var sme = ChannelDispatcher.Host.Extensions.Find<ServiceMetadataExtension> ();
 			if (sme == null)
@@ -92,8 +92,8 @@ namespace System.ServiceModel.Channels.Http
 			//                     |  T  | F  |  F  |  T |
 
 			bool match =
-				(mex.WsdlUrl != null && Uri.Compare (ctx.RequestUrl, mex.WsdlUrl, cmpflag, fmtflag, StringComparison.Ordinal) == 0) ||
-				(mex.HelpUrl != null && Uri.Compare (ctx.RequestUrl, mex.HelpUrl, cmpflag, fmtflag, StringComparison.Ordinal) == 0);
+				(mex.WsdlUrl != null && Uri.Compare (ctx.Request.Url, mex.WsdlUrl, cmpflag, fmtflag, StringComparison.Ordinal) == 0) ||
+				(mex.HelpUrl != null && Uri.Compare (ctx.Request.Url, mex.HelpUrl, cmpflag, fmtflag, StringComparison.Ordinal) == 0);
 
 			return !(match ^ ChannelDispatcher.IsMex);
 		}