Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/System/System.Net/WebConnection.cs

@@ -59,12 +59,11 @@ namespace System.Net
 		WaitCallback initConn;
 		bool keepAlive;
 		byte [] buffer;
-		static AsyncCallback readDoneDelegate = new AsyncCallback (ReadDone);
 		EventHandler abortHandler;
 		AbortHelper abortHelper;
 		internal WebConnectionData Data;
 		bool chunkedRead;
-		ChunkStream chunkStream;
+		MonoChunkStream chunkStream;
 		Queue queue;
 		bool reused;
 		int position;
@@ -90,7 +89,7 @@ namespace System.Net
 		static extern void xamarin_start_wwan (string uri);
 #endif
 
-		internal ChunkStream ChunkStream {
+		internal MonoChunkStream MonoChunkStream {
 			get { return chunkStream; }
 		}
 
@@ -100,11 +99,6 @@ namespace System.Net
 			this.sPoint = sPoint;
 			buffer = new byte [4096];
 			Data = new WebConnectionData ();
-			initConn = new WaitCallback (state => {
-				try {
-					InitConnection (state);
-				} catch {}
-				});
 			queue = wcs.Group.Queue;
 			abortHelper = new AbortHelper ();
 			abortHelper.Connection = this;
@@ -460,13 +454,12 @@ namespace System.Net
 			}
 		}
 		
-		static void ReadDone (IAsyncResult result)
+		void ReadDone (IAsyncResult result)
 		{
-			WebConnection cnc = (WebConnection)result.AsyncState;
-			WebConnectionData data = cnc.Data;
-			Stream ns = cnc.nstream;
+			WebConnectionData data = Data;
+			Stream ns = nstream;
 			if (ns == null) {
-				cnc.Close (true);
+				Close (true);
 				return;
 			}
 
@@ -479,84 +472,84 @@ namespace System.Net
 				if (e.InnerException is ObjectDisposedException)
 					return;
 
-				cnc.HandleError (WebExceptionStatus.ReceiveFailure, e, "ReadDone1");
+				HandleError (WebExceptionStatus.ReceiveFailure, e, "ReadDone1");
 				return;
 			}
 
 			if (nread == 0) {
-				cnc.HandleError (WebExceptionStatus.ReceiveFailure, null, "ReadDone2");
+				HandleError (WebExceptionStatus.ReceiveFailure, null, "ReadDone2");
 				return;
 			}
 
 			if (nread < 0) {
-				cnc.HandleError (WebExceptionStatus.ServerProtocolViolation, null, "ReadDone3");
+				HandleError (WebExceptionStatus.ServerProtocolViolation, null, "ReadDone3");
 				return;
 			}
 
 			int pos = -1;
-			nread += cnc.position;
+			nread += position;
 			if (data.ReadState == ReadState.None) { 
 				Exception exc = null;
 				try {
-					pos = GetResponse (data, cnc.sPoint, cnc.buffer, nread);
+					pos = GetResponse (data, sPoint, buffer, nread);
 				} catch (Exception e) {
 					exc = e;
 				}
 
 				if (exc != null || pos == -1) {
-					cnc.HandleError (WebExceptionStatus.ServerProtocolViolation, exc, "ReadDone4");
+					HandleError (WebExceptionStatus.ServerProtocolViolation, exc, "ReadDone4");
 					return;
 				}
 			}
 
 			if (data.ReadState == ReadState.Aborted) {
-				cnc.HandleError (WebExceptionStatus.RequestCanceled, null, "ReadDone");
+				HandleError (WebExceptionStatus.RequestCanceled, null, "ReadDone");
 				return;
 			}
 
 			if (data.ReadState != ReadState.Content) {
 				int est = nread * 2;
-				int max = (est < cnc.buffer.Length) ? cnc.buffer.Length : est;
+				int max = (est < buffer.Length) ? buffer.Length : est;
 				byte [] newBuffer = new byte [max];
-				Buffer.BlockCopy (cnc.buffer, 0, newBuffer, 0, nread);
-				cnc.buffer = newBuffer;
-				cnc.position = nread;
+				Buffer.BlockCopy (buffer, 0, newBuffer, 0, nread);
+				buffer = newBuffer;
+				position = nread;
 				data.ReadState = ReadState.None;
-				InitRead (cnc);
+				InitRead ();
 				return;
 			}
 
-			cnc.position = 0;
+			position = 0;
 
-			WebConnectionStream stream = new WebConnectionStream (cnc, data);
+			WebConnectionStream stream = new WebConnectionStream (this, data);
 			bool expect_content = ExpectContent (data.StatusCode, data.request.Method);
 			string tencoding = null;
 			if (expect_content)
 				tencoding = data.Headers ["Transfer-Encoding"];
 
-			cnc.chunkedRead = (tencoding != null && tencoding.IndexOf ("chunked", StringComparison.OrdinalIgnoreCase) != -1);
-			if (!cnc.chunkedRead) {
-				stream.ReadBuffer = cnc.buffer;
+			chunkedRead = (tencoding != null && tencoding.IndexOf ("chunked", StringComparison.OrdinalIgnoreCase) != -1);
+			if (!chunkedRead) {
+				stream.ReadBuffer = buffer;
 				stream.ReadBufferOffset = pos;
 				stream.ReadBufferSize = nread;
 				try {
 					stream.CheckResponseInBuffer ();
 				} catch (Exception e) {
-					cnc.HandleError (WebExceptionStatus.ReceiveFailure, e, "ReadDone7");
+					HandleError (WebExceptionStatus.ReceiveFailure, e, "ReadDone7");
 				}
-			} else if (cnc.chunkStream == null) {
+			} else if (chunkStream == null) {
 				try {
-					cnc.chunkStream = new ChunkStream (cnc.buffer, pos, nread, data.Headers);
+					chunkStream = new MonoChunkStream (buffer, pos, nread, data.Headers);
 				} catch (Exception e) {
-					cnc.HandleError (WebExceptionStatus.ServerProtocolViolation, e, "ReadDone5");
+					HandleError (WebExceptionStatus.ServerProtocolViolation, e, "ReadDone5");
 					return;
 				}
 			} else {
-				cnc.chunkStream.ResetBuffer ();
+				chunkStream.ResetBuffer ();
 				try {
-					cnc.chunkStream.Write (cnc.buffer, pos, nread);
+					chunkStream.Write (buffer, pos, nread);
 				} catch (Exception e) {
-					cnc.HandleError (WebExceptionStatus.ServerProtocolViolation, e, "ReadDone6");
+					HandleError (WebExceptionStatus.ServerProtocolViolation, e, "ReadDone6");
 					return;
 				}
 			}
@@ -576,16 +569,15 @@ namespace System.Net
 			return (statusCode >= 200 && statusCode != 204 && statusCode != 304);
 		}
 
-		internal static void InitRead (object state)
+		internal void InitRead ()
 		{
-			WebConnection cnc = (WebConnection) state;
-			Stream ns = cnc.nstream;
+			Stream ns = nstream;
 
 			try {
-				int size = cnc.buffer.Length - cnc.position;
-				ns.BeginRead (cnc.buffer, cnc.position, size, readDoneDelegate, cnc);
+				int size = buffer.Length - position;
+				ns.BeginRead (buffer, position, size, ReadDone, null);
 			} catch (Exception e) {
-				cnc.HandleError (WebExceptionStatus.ReceiveFailure, e, "InitRead");
+				HandleError (WebExceptionStatus.ReceiveFailure, e, "InitRead");
 			}
 		}
 		
@@ -709,9 +701,8 @@ namespace System.Net
 			return -1;
 		}
 		
-		void InitConnection (object state)
+		void InitConnection (HttpWebRequest request)
 		{
-			HttpWebRequest request = (HttpWebRequest) state;
 			request.WebConnection = this;
 			if (request.ReuseConnection)
 				request.StoredConnection = this;
@@ -773,7 +764,7 @@ namespace System.Net
 			lock (this) {
 				if (state.TrySetBusy ()) {
 					status = WebExceptionStatus.Success;
-					ThreadPool.QueueUserWorkItem (initConn, request);
+					ThreadPool.QueueUserWorkItem (o => { try { InitConnection ((HttpWebRequest) o); } catch {} }, request);
 				} else {
 					lock (queue) {
 #if MONOTOUCH
@@ -898,7 +889,7 @@ namespace System.Net
 				WebAsyncResult wr = new WebAsyncResult (cb, state, buffer, offset, size);
 				wr.InnerAsyncResult = result;
 				if (result == null) {
-					// Will be completed from the data in ChunkStream
+					// Will be completed from the data in MonoChunkStream
 					wr.SetCompleted (true, (Exception) null);
 					wr.DoCallback ();
 				}
@@ -960,7 +951,7 @@ namespace System.Net
 			return (nbytes != 0) ? nbytes : -1;
 		}
 
-		// To be called on chunkedRead when we can read no data from the ChunkStream yet
+		// To be called on chunkedRead when we can read no data from the MonoChunkStream yet
 		int EnsureRead (byte [] buffer, int offset, int size)
 		{
 			byte [] morebytes = null;