Merge pull request #819 from brendanzagaeski/patch-1

[mono.git] / mcs / class / System / System.Net / WebRequest.cs

diff --git a/mcs/class/System/System.Net/WebRequest.cs b/mcs/class/System/System.Net/WebRequest.cs
index df007846cc6f65ae96de0488a417b228debf7231..eeed685db3af763ec2a84aa1f0b8ec177c79d5b2 100644 (file)
--- a/mcs/class/System/System.Net/WebRequest.cs
+++ b/mcs/class/System/System.Net/WebRequest.cs
@@ -53,31 +53,22 @@ namespace System.Net.Configuration {
 
 namespace System.Net 
 {
-#if MOONLIGHT
-       internal abstract class WebRequest : ISerializable {
-#else
        [Serializable]
        public abstract class WebRequest : MarshalByRefObject, ISerializable {
-#endif
                static HybridDictionary prefixes = new HybridDictionary ();
                static bool isDefaultWebProxySet;
                static IWebProxy defaultWebProxy;
                static RequestCachePolicy defaultCachePolicy;
-               
-               // Constructors
-               
+
                static WebRequest ()
                {
-#if NET_2_1
+#if MOBILE
                        IWebRequestCreate http = new HttpRequestCreator ();
                        RegisterPrefix ("http", http);
                        RegisterPrefix ("https", http);
-       #if MOBILE
                        RegisterPrefix ("file", new FileWebRequestCreator ());
                        RegisterPrefix ("ftp", new FtpRequestCreator ());
-       #endif
 #else
-                       defaultCachePolicy = new HttpRequestCachePolicy (HttpRequestCacheLevel.NoCacheNoStore);
        #if CONFIGURATION_DEP
                        object cfg = ConfigurationManager.GetSection ("system.net/webRequestModules");
                        WebRequestModulesSection s = cfg as WebRequestModulesSection;
@@ -118,14 +109,6 @@ namespace System.Net
                                authentication_level = value;
                        }
                }
-
-               [MonoTODO ("Implement the caching system. Currently always returns a policy with the NoCacheNoStore level")]
-               public virtual RequestCachePolicy CachePolicy
-               {
-                       get { return DefaultCachePolicy; }
-                       set {
-                       }
-               }
                
                public virtual string ConnectionGroupName {
                        get { throw GetMustImplement (); }
@@ -147,9 +130,18 @@ namespace System.Net
                        set { throw GetMustImplement (); }
                }
 
-               public static RequestCachePolicy DefaultCachePolicy
+               [MonoTODO ("Implement the caching system. Currently always returns a policy with the NoCacheNoStore level")]
+               public virtual RequestCachePolicy CachePolicy
                {
-                       get { return defaultCachePolicy; }
+                       get { return DefaultCachePolicy; }
+                       set {
+                       }
+               }
+               
+               public static RequestCachePolicy DefaultCachePolicy {
+                       get {
+                               return defaultCachePolicy ?? (defaultCachePolicy = new HttpRequestCachePolicy (HttpRequestCacheLevel.NoCacheNoStore));
+                       }
                        set {
                                throw GetMustImplement ();
                        }
@@ -160,12 +152,7 @@ namespace System.Net
                        set { throw GetMustImplement (); }
                }
                
-#if !MOONLIGHT
-               public TokenImpersonationLevel ImpersonationLevel {
-                       get { throw GetMustImplement (); }
-                       set { throw GetMustImplement (); }
-               }
-#endif
+
                public virtual string Method { 
                        get { throw GetMustImplement (); }
                        set { throw GetMustImplement (); }
@@ -199,7 +186,9 @@ namespace System.Net
                                throw GetMustImplement ();
                        }
                }
-               
+
+               public TokenImpersonationLevel ImpersonationLevel { get; set; }
+
 //             volatile static IWebProxy proxy;
                static readonly object lockobj = new object ();
                
@@ -297,7 +286,7 @@ namespace System.Net
                                throw new ArgumentNullException ("requestUri");
                        return GetCreator (requestUri.Scheme).Create (requestUri);
                }
-#if NET_4_5 || MOBILE  
+#if NET_4_0
                [MonoTODO ("for portable library support")]
                public static HttpWebRequest CreateHttp (string requestUriString)
                {
@@ -333,6 +322,15 @@ namespace System.Net
                [MonoTODO("Look in other places for proxy config info")]
                public static IWebProxy GetSystemWebProxy ()
                {
+#if MONOTOUCH
+                       return CFNetwork.GetDefaultProxy ();
+#else
+#if MONODROID
+                       // Return the system web proxy.  This only works for ICS+.
+                       var androidProxy = AndroidPlatform.GetDefaultProxy ();
+                       if (androidProxy != null)
+                               return androidProxy;
+#endif
 #if !NET_2_1
                        if (IsWindows ()) {
                                int iProxyEnable = (int)Microsoft.Win32.Registry.GetValue ("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", "ProxyEnable", 0);
@@ -423,6 +421,7 @@ namespace System.Net
 #endif
                        
                        return new WebProxy ();
+#endif // MONOTOUCH
                }
 
                void ISerializable.GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)