2009-09-17 Atsushi Enomoto <atsushi@ximian.com>

	* ServiceMetadataExtension.cs : when its url is requested without
	  any parameters, it simply returns the WSDL, not the help page.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
index c984ed9bc3f25780ecb86ed4625b88eac6c7b8e7..9d9c0b09ec5572845d615f79ba50475abc09ca18 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ServiceMetadataExtension.cs : when its url is requested without
+         any parameters, it simply returns the WSDL, not the help page.
+
 2009-09-15  Atsushi Enomoto  <atsushi@ximian.com>
 
        * WebServiceHelper.cs : remove old code.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs
index efb346bdf215a5c6e33817302864be4042ae9e7c..2ae4f305c27f9291e45498b62599264820edd87f 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs
@@ -169,8 +169,12 @@ namespace System.ServiceModel.Description
                        HttpRequestMessageProperty prop = (HttpRequestMessageProperty) req.Properties [HttpRequestMessageProperty.Name];
 
                        NameValueCollection query_string = CreateQueryString (prop.QueryString);
-                       if (query_string == null || query_string.AllKeys.Length != 1)
-                               return CreateHelpPage (req);
+                       if (query_string == null || query_string.AllKeys.Length != 1) {
+                               //return CreateHelpPage (req);
+                               WSServiceDescription w = GetWsdl ("wsdl");
+                               if (w != null)
+                                       return CreateWsdlMessage (w);
+                       }
 
                        if (query_string [null] == "wsdl") {
                                WSServiceDescription wsdl = GetWsdl ("wsdl");