2009-01-12 Geoff Norton <gnorton@novell.com>

        * WebClient_2.1.cs: SL2 webclient supports BaseAddress.

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

diff --git a/mcs/class/System.Net/System.Net/ChangeLog b/mcs/class/System.Net/System.Net/ChangeLog
index a2c70e717c7008f005015101348dd4d9a63e997e..dcce9febf5c9c6bc84c006f75a985b57faa49211 100644 (file)
--- a/mcs/class/System.Net/System.Net/ChangeLog
+++ b/mcs/class/System.Net/System.Net/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-12  Geoff Norton  <gnorton@novell.com>
+
+       * WebClient_2.1.cs: SL2 webclient supports BaseAddress.
+
 2008-10-16  Jb Evain  <jbevain@novell.com>
 
        * WebHeaderCollection_2_1.cs: update to SL2 api.

diff --git a/mcs/class/System.Net/System.Net/WebClient_2_1.cs b/mcs/class/System.Net/System.Net/WebClient_2_1.cs
index 1fea930f1451ad674f0a72a8629ae3f9c123722a..6f93912ff26f564147821af18b5e5cdea206073a 100644 (file)
--- a/mcs/class/System.Net/System.Net/WebClient_2_1.cs
+++ b/mcs/class/System.Net/System.Net/WebClient_2_1.cs
@@ -81,8 +81,8 @@ namespace System.Net
 //             ICredentials credentials;
 //             WebHeaderCollection headers;
 //             WebHeaderCollection responseHeaders;
-//             Uri baseAddress;
-//             string baseString;
+               Uri baseAddress;
+               string baseString;
 //             NameValueCollection queryString;
                bool is_busy, async;
                Thread async_thread;
@@ -107,25 +107,25 @@ namespace System.Net
 //             
 //             // Properties
 //             
-//             public string BaseAddress {
-//                     get {
-//                             if (baseString == null) {
-//                                     if (baseAddress == null)
-//                                             return "";
-//                             }
-//
-//                             baseString = baseAddress.ToString ();
-//                             return baseString;
-//                     }
-//                     
-//                     set {
-//                             if (value == null || value == "") {
-//                                     baseAddress = null;
-//                             } else {
-//                                     baseAddress = new Uri (value);
-//                             }
-//                     }
-//             }
+               public string BaseAddress {
+                       get {
+                               if (baseString == null) {
+                                       if (baseAddress == null)
+                                               return "";
+                               }
+
+                               baseString = baseAddress.ToString ();
+                               return baseString;
+                       }
+                       
+                       set {
+                               if (value == null || value == "") {
+                                       baseAddress = null;
+                               } else {
+                                       baseAddress = new Uri (value);
+                               }
+                       }
+               }
 //
 //#if NET_2_0
 //             static Exception GetMustImplement ()
@@ -864,7 +864,7 @@ namespace System.Net
 //             
                WebRequest SetupRequest (Uri uri)
                {
-                       WebRequest request = WebRequest.Create (uri);
+                       WebRequest request = WebRequest.Create (baseAddress != null ? new Uri (baseAddress, uri) : uri);
 //                     if (Proxy != null)
 //                             request.Proxy = Proxy;
 //                     request.Credentials = credentials;