Merge pull request #2020 from tomjepp/master

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

diff --git a/mcs/class/System/System.Net/WebResponse.cs b/mcs/class/System/System.Net/WebResponse.cs
index 7e544a560d33ba12805e1e17036122e5f8773414..f59b24fc1c38cfbe8e491a3db3fc8cf81f7d000a 100644 (file)
--- a/mcs/class/System/System.Net/WebResponse.cs
+++ b/mcs/class/System/System.Net/WebResponse.cs
@@ -85,12 +85,14 @@ namespace System.Net
                public virtual Uri ResponseUri {                \r
                        get { throw new NotSupportedException (); }\r
                }               \r
-#if NET_4_0\r
-               [MonoTODO ("for portable library support")]\r
+\r
                public virtual bool SupportsHeaders {\r
-                       get { throw new NotImplementedException (); }\r
+                       get {\r
+                               // The managed stack always returns this as true, it is only\r
+                               // the Silverlight stack that does not support this.\r
+                               return true;\r
+                       }\r
                }\r
-#endif\r
                // Methods\r
                \r
                public virtual void Close()\r
@@ -102,15 +104,15 @@ namespace System.Net
                {\r
                        throw new NotSupportedException ();\r
                }\r
-#if TARGET_JVM //enable overrides for extenders\r
-               public virtual void Dispose()\r
-#elif NET_4_0\r
                public void Dispose ()\r
-#else\r
-               void IDisposable.Dispose()\r
-#endif\r
                {\r
-                       Close ();\r
+                       Dispose (true);\r
+               }\r
+               \r
+               protected virtual void Dispose (bool disposing)\r
+               {\r
+                       if (disposing)\r
+                               Close ();\r
                }\r
 \r
                void ISerializable.GetObjectData\r