2009-05-18 Miguel de Icaza <miguel@novell.com>

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

diff --git a/mcs/class/System/System.Net/WebConnectionStream.cs b/mcs/class/System/System.Net/WebConnectionStream.cs
index f37a60095c04dd10c68b21ee401220e755ca6de5..362ef041aa26118fca58ee6606060c615f346217 100644 (file)
--- a/mcs/class/System/System.Net/WebConnectionStream.cs
+++ b/mcs/class/System/System.Net/WebConnectionStream.cs
@@ -62,12 +62,16 @@ namespace System.Net
                bool read_eof;
                bool complete_request_written;
                long max_buffer_size;
+               int read_timeout;
+               int write_timeout;
 
                public WebConnectionStream (WebConnection cnc)
                {
                        isRead = true;
                        pending = new ManualResetEvent (true);
                        this.request = cnc.Data.request;
+                       read_timeout = request.ReadWriteTimeout;
+                       write_timeout = read_timeout;
                        this.cnc = cnc;
                        string contentType = cnc.Data.Headers ["Transfer-Encoding"];
                        bool chunkedRead = (contentType != null && contentType.ToLower ().IndexOf ("chunked") != -1);
@@ -89,6 +93,8 @@ namespace System.Net
 
                public WebConnectionStream (WebConnection cnc, HttpWebRequest request)
                {
+                       read_timeout = request.ReadWriteTimeout;
+                       write_timeout = read_timeout;
                        isRead = false;
                        this.cnc = cnc;
                        this.request = request;
@@ -130,6 +136,36 @@ namespace System.Net
                }
 #endif
 
+#if NET_2_0
+               public override
+#endif
+               int ReadTimeout {
+                       get {
+                               return read_timeout;
+                       }
+
+                       set {
+                               if (value < -1)
+                                       throw new ArgumentOutOfRangeException ("value");
+                               read_timeout = value;
+                       }
+               }
+
+#if NET_2_0
+               public override
+#endif
+               int WriteTimeout {
+                       get {
+                               return write_timeout;
+                       }
+
+                       set {
+                               if (value < -1)
+                                       throw new ArgumentOutOfRangeException ("value");
+                               write_timeout = value;
+                       }
+               }
+
                internal bool CompleteRequestWritten {
                        get { return complete_request_written; }
                }
@@ -161,6 +197,8 @@ namespace System.Net
                internal void ForceCompletion ()
                {
                        if (!nextReadCalled) {
+                               if (contentLength == Int32.MaxValue)
+                                       contentLength = 0;
                                nextReadCalled = true;
                                cnc.NextRead ();
                        }
@@ -276,11 +314,10 @@ namespace System.Net
 
                        AsyncCallback cb = new AsyncCallback (ReadCallbackWrapper);
                        WebAsyncResult res = (WebAsyncResult) BeginRead (buffer, offset, size, cb, null);
-                       if (!res.IsCompleted && !res.WaitUntilComplete (request.ReadWriteTimeout, false)) {
+                       if (!res.IsCompleted && !res.WaitUntilComplete (ReadTimeout, false)) {
                                nextReadCalled = true;
                                cnc.Close (true);
-                               throw new WebException ("The operation has timed out.",
-                                       WebExceptionStatus.Timeout);
+                               throw new WebException ("The operation has timed out.", WebExceptionStatus.Timeout);
                        }
 
                        return EndRead (res);
@@ -500,7 +537,7 @@ namespace System.Net
 
                        AsyncCallback cb = new AsyncCallback (WriteCallbackWrapper);
                        WebAsyncResult res = (WebAsyncResult) BeginWrite (buffer, offset, size, cb, null);
-                       if (!res.IsCompleted && !res.WaitUntilComplete (request.ReadWriteTimeout, false)) {
+                       if (!res.IsCompleted && !res.WaitUntilComplete (WriteTimeout, false)) {
                                nextReadCalled = true;
                                cnc.Close (true);
                                throw new IOException ("Write timed out.");
@@ -655,7 +692,9 @@ namespace System.Net
                                return;
 
                        long length = request.ContentLength;
-                       if (length != -1 && length > writeBuffer.Length)
+
+                       // writeBuffer could be null if KillBuffer was already called.
+                       if (writeBuffer != null && length != -1 && length > writeBuffer.Length)
                                throw new IOException ("Cannot close the stream until all bytes are written");
 
                        WriteRequest ();