Merge remote branch 'upstream/master'

[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 4f1cc91dac332734afcb020cc01afe29ae0991e0..3c0a3154d476462e8235c66cb4d80e07db3cb1ec 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,13 +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)
                {
@@ -39,7 +61,6 @@ namespace System.Net
 
                public WebAsyncResult (HttpWebRequest request, AsyncCallback cb, object state)
                {
-                       this.request = request;
                        this.cb = cb;
                        this.state = state;
                }
@@ -68,7 +89,6 @@ namespace System.Net
                {
                        callbackDone = false;
                        exc = null;
-                       request = null;
                        response = null;
                        writeStream = null;
                        exc = null;