Merge remote branch 'upstream/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 0018411b5bdf2336a7f5f96dd32f6e4829603432..b87d65b40c2e2f3b18c79f2672c4209949d8cdd5 100644 (file)
--- a/mcs/class/System/System.Net/WebResponse.cs
+++ b/mcs/class/System/System.Net/WebResponse.cs
@@ -32,9 +32,12 @@ using System.Runtime.Serialization;
 \r
 namespace System.Net \r
 {\r
+#if MOONLIGHT\r
+       internal abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable {\r
+#else\r
        [Serializable]\r
-       public abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable\r
-       {\r
+       public abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable {\r
+#endif\r
                // Constructors\r
                \r
                protected WebResponse () { }\r
@@ -59,6 +62,27 @@ namespace System.Net
                public virtual WebHeaderCollection Headers {            \r
                        get { throw new NotSupportedException (); }\r
                }\r
+\r
+               static Exception GetMustImplement ()\r
+               {\r
+                       return new NotImplementedException ();\r
+               }\r
+               \r
+               [MonoTODO]\r
+               public virtual bool IsFromCache\r
+               {\r
+                       get {\r
+                               throw GetMustImplement ();\r
+                       }\r
+               }\r
+               \r
+               [MonoTODO]\r
+               public virtual bool IsMutuallyAuthenticated\r
+               {\r
+                       get {\r
+                               throw GetMustImplement ();\r
+                       }\r
+               }\r
                \r
                public virtual Uri ResponseUri {                \r
                        get { throw new NotSupportedException (); }\r
@@ -83,15 +107,18 @@ namespace System.Net
                {\r
                        Close ();\r
                }\r
-#if TARGET_JVM //enable overrides for extenders\r
-               public virtual void GetObjectData\r
-#else\r
+\r
                void ISerializable.GetObjectData\r
-#endif\r
                        (SerializationInfo serializationInfo,\r
                                                  StreamingContext streamingContext)\r
                {\r
                        throw new NotSupportedException ();\r
-               }               \r
+               }\r
+\r
+               [MonoTODO]\r
+               protected virtual void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)\r
+               {\r
+                       throw GetMustImplement ();\r
+               }\r
        }\r
 }\r