2004-12-11 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* net_1_1/DefaultWsdlHelpGenerator.aspx:
	* net_2_0/DefaultWsdlHelpGenerator.aspx: now that CookieContainer is
	more like what it should be, we need to pass the URI too. Fixes bug
	#70435.

svn path=/trunk/mono/; revision=37629

diff --git a/data/net_1_1/DefaultWsdlHelpGenerator.aspx b/data/net_1_1/DefaultWsdlHelpGenerator.aspx
index f0f74e682bc7f615d88ba7b42fab600c31406424..15f15a25f8917a9fee1ee646bd1e1277b20f322f 100644 (file)
--- a/data/net_1_1/DefaultWsdlHelpGenerator.aspx
+++ b/data/net_1_1/DefaultWsdlHelpGenerator.aspx
@@ -337,7 +337,9 @@ string GetTestResult ()
        
        try
        {
-               WebRequest req = WebRequest.Create (location + "/" + CurrentOperationName + "?" + qs);
+               string url = location + "/" + CurrentOperationName;
+               Uri uri = new Uri (url);
+               WebRequest req = WebRequest.Create (url + "?" + qs);
                HttpCookieCollection cookies = Request.Cookies;
                int last = cookies.Count;
                if (last > 0) {
@@ -345,7 +347,7 @@ string GetTestResult ()
                        for (int i = 0; i < last; i++) {
                                HttpCookie hcookie = cookies [i];
                                Cookie cookie = new Cookie (hcookie.Name, hcookie.Value, hcookie.Path, hcookie.Domain);
-                               container.Add (cookie);
+                               container.Add (uri, cookie);
                        }
                        ((HttpWebRequest) req).CookieContainer = container;
                }

diff --git a/data/net_2_0/DefaultWsdlHelpGenerator.aspx b/data/net_2_0/DefaultWsdlHelpGenerator.aspx
index 3f529af4e3a307abac58898dec2a811b235364bb..8324d417359c54997a95954ba1d0f97829dc7331 100644 (file)
--- a/data/net_2_0/DefaultWsdlHelpGenerator.aspx
+++ b/data/net_2_0/DefaultWsdlHelpGenerator.aspx
@@ -344,7 +344,9 @@ string GetTestResult ()
        
        try
        {
-               WebRequest req = WebRequest.Create (location + "/" + CurrentOperationName + "?" + qs);
+               string url = location + "/" + CurrentOperationName;
+               Uri uri = new Uri (url);
+               WebRequest req = WebRequest.Create (url + "?" + qs);
                HttpCookieCollection cookies = Request.Cookies;
                int last = cookies.Count;
                if (last > 0) {
@@ -352,7 +354,7 @@ string GetTestResult ()
                        for (int i = 0; i < last; i++) {
                                HttpCookie hcookie = cookies [i];
                                Cookie cookie = new Cookie (hcookie.Name, hcookie.Value, hcookie.Path, hcookie.Domain);
-                               container.Add (cookie);
+                               container.Add (uri, cookie);
                        }
                        ((HttpWebRequest) req).CookieContainer = container;
                }