Merge pull request #409 from Alkarex/patch-1

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

diff --git a/mcs/class/System/System.Net/WebAsyncResult.cs b/mcs/class/System/System.Net/WebAsyncResult.cs
index f591db8c61730a67b3b26554575235f31f45c22a..7cc9d5e1d8bfca35b1ff1e4cc3357efcde210204 100644 (file)
--- a/mcs/class/System/System.Net/WebAsyncResult.cs
+++ b/mcs/class/System/System.Net/WebAsyncResult.cs
@@ -7,6 +7,27 @@
 // (C) 2003 Ximian, Inc (http://www.ximian.com)
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.IO;
 using System.Threading;
 
@@ -23,12 +44,14 @@ namespace System.Net
                IAsyncResult innerAsyncResult;
                bool callbackDone;
                Exception exc;
-               HttpWebRequest request;
                HttpWebResponse response;
                Stream writeStream;
                byte [] buffer;
                int offset;
                int size;
+               object locker = new object ();
+               public bool EndCalled;
+               public bool AsyncWriteAll;
 
                public WebAsyncResult (AsyncCallback cb, object state)
                {
@@ -38,7 +61,6 @@ namespace System.Net
 
                public WebAsyncResult (HttpWebRequest request, AsyncCallback cb, object state)
                {
-                       this.request = request;
                        this.cb = cb;
                        this.state = state;
                }
@@ -54,63 +76,84 @@ namespace System.Net
 
                internal void SetCompleted (bool synch, Exception e)
                {
-                       isCompleted = true;
                        this.synch = synch;
                        exc = e;
-                       ((ManualResetEvent) AsyncWaitHandle).Set ();
+                       lock (locker) {
+                               isCompleted = true;
+                               if (handle != null)
+                                       handle.Set ();
+                       }
                }
                
                internal void Reset ()
                {
-                       isCompleted = false;
                        callbackDone = false;
                        exc = null;
-                       request = null;
                        response = null;
                        writeStream = null;
                        exc = null;
-                       if (handle != null)
-                               handle.Reset ();
+                       lock (locker) {
+                               isCompleted = false;
+                               if (handle != null)
+                                       handle.Reset ();
+                       }
                }
 
                internal void SetCompleted (bool synch, int nbytes)
                {
-                       isCompleted = true;
                        this.synch = synch;
                        this.nbytes = nbytes;
                        exc = null;
-                       ((ManualResetEvent) AsyncWaitHandle).Set ();
+                       lock (locker) {
+                               isCompleted = true;
+                               if (handle != null)
+                                       handle.Set ();
+                       }
                }
                
                internal void SetCompleted (bool synch, Stream writeStream)
                {
-                       isCompleted = true;
                        this.synch = synch;
                        this.writeStream = writeStream;
                        exc = null;
-                       ((ManualResetEvent) AsyncWaitHandle).Set ();
+                       lock (locker) {
+                               isCompleted = true;
+                               if (handle != null)
+                                       handle.Set ();
+                       }
                }
                
                internal void SetCompleted (bool synch, HttpWebResponse response)
                {
-                       isCompleted = true;
                        this.synch = synch;
                        this.response = response;
                        exc = null;
-                       ((ManualResetEvent) AsyncWaitHandle).Set ();
+                       lock (locker) {
+                               isCompleted = true;
+                               if (handle != null)
+                                       handle.Set ();
+                       }
                }
                
                internal void DoCallback ()
                {
                        if (!callbackDone && cb != null) {
                                callbackDone = true;
-                               cb (this);
+                               if (synch)
+                                       cb (this);
+                               else
+                                       ThreadPool.QueueUserWorkItem (CB, null);
                        }
                }
+
+               void CB (object unused)
+               {
+                       cb (this);
+               }
                
                internal void WaitUntilComplete ()
                {
-                       if (isCompleted)
+                       if (IsCompleted)
                                return;
 
                        AsyncWaitHandle.WaitOne ();
@@ -118,7 +161,7 @@ namespace System.Net
 
                internal bool WaitUntilComplete (int timeout, bool exitContext)
                {
-                       if (isCompleted)
+                       if (IsCompleted)
                                return true;
 
                        return AsyncWaitHandle.WaitOne (timeout, exitContext);
@@ -130,11 +173,9 @@ namespace System.Net
 
                public WaitHandle AsyncWaitHandle {
                        get {
-                               if (handle == null) {
-                                       lock (this) {
-                                               if (handle == null)
-                                                       handle = new ManualResetEvent (isCompleted);
-                                       }
+                               lock (locker) {
+                                       if (handle == null)
+                                               handle = new ManualResetEvent (isCompleted);
                                }
                                
                                return handle;
@@ -146,7 +187,11 @@ namespace System.Net
                }
 
                public bool IsCompleted {
-                       get { return isCompleted; }
+                       get {
+                               lock (locker) {
+                                       return isCompleted;
+                               }
+                       }
                }
 
                internal bool GotException {