2010-03-19 Atsushi Enomoto <atsushi@ximian.com>

	* WebHttpBehavior.cs : set FilterPriority to make it in higher
	  priority than conflicting endpoints (such as mex endpoint).

svn path=/trunk/mcs/; revision=153876

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
index 7600e0e55b3ecb88688d5565fa9dde07af030e08..cea57d025061afc6a6e2bb97c6c17991e97f7b75 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-19  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * WebHttpBehavior.cs : set FilterPriority to make it in higher
+         priority than conflicting endpoints (such as mex endpoint).
+
 2010-03-16  Jb Evain  <jbevain@novell.com>
 
        * WebHttpBehavior.cs: use MOONLIGHT symbol to

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
index e94d80efb11980bd8b37410ce2a4701aeb5c98cb..c17c78899c908a01b62c9cc5bfee0dc5302ce79d 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
@@ -118,6 +118,7 @@ namespace System.ServiceModel.Description
                {
                        endpointDispatcher.DispatchRuntime.OperationSelector = GetOperationSelector (endpoint);
                        // FIXME: get HostNameComparisonMode from WebHttpBinding by some means.
+                       endpointDispatcher.FilterPriority = 1; // It is to take higher priority than that of ServiceMetadataExtension (whose URL likely conflicts with this one).
                        endpointDispatcher.AddressFilter = new PrefixEndpointAddressMessageFilter (endpoint.Address);
                        endpointDispatcher.ContractFilter = new MatchAllMessageFilter ();
                        AddServerErrorHandlers (endpoint, endpointDispatcher);