Author: gonzalo
Date: 2005-08-03 21:02:54 -0400 (Wed, 03 Aug 2005)
New Revision: 47986

Modified:
   trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
   
trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
Log:
2005-08-03 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>

        * DiscoveryClientProtocol.cs: use Uri so that relative paths are handled
        gracefully.



Modified: 
trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog 
2005-08-04 00:27:22 UTC (rev 47985)
+++ trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog 
2005-08-04 01:02:54 UTC (rev 47986)
@@ -1,3 +1,8 @@
+2005-08-03 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+       * DiscoveryClientProtocol.cs: use Uri so that relative paths are handled
+       gracefully.
+
 2005-05-08 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
 
        * SchemaReference.cs: fixed the setter for TargetNamespace.

Modified: 
trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
===================================================================
--- 
trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
        2005-08-04 00:27:22 UTC (rev 47985)
+++ 
trunk/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
        2005-08-04 01:02:54 UTC (rev 47986)
@@ -126,7 +126,10 @@
                                                int i = url.LastIndexOf ('/');
                                                if (i == -1)
                                                        throw new 
InvalidOperationException ("The HTML document does not contain Web service 
discovery information");
-                                               url = url.Substring (0,i+1) + 
m.Groups[1];
+
+                                               Uri tmp = new Uri (url);
+                                               tmp = new Uri (tmp, m.Groups 
[1].ToString ());
+                                               url = tmp.ToString ();
                                        }
                                        stream = Download (ref url);
                                }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to