Set NetworkStream.ReadTimeout in WebConnection.InitConnection(). (mono#6904)

monojenkins · akoeplinger · commit dd5b5ca52e0a · 2018-02-09T21:21:52.000+01:00
Setting ReadTimeout in WebResponseStream.ctor throws System.Net.Sockets.SocketException : Invalid arguments on iOS.

Set it in WebConnection.InitConnection() immediately after establishing a connection, before we read/write anything.
diff --git a/mcs/class/System/System.Net/WebConnection.cs b/mcs/class/System/System.Net/WebConnection.cs
@@ -265,6 +265,8 @@ internal async Task<WebRequestStream> InitConnection (WebOperation operation, Ca
 				goto retry;
 			}
 
+			networkStream.ReadTimeout = operation.Request.ReadWriteTimeout;
+
 			return new WebRequestStream (this, operation, networkStream, tunnel);
 		}
 
diff --git a/mcs/class/System/System.Net/WebResponseStream.cs b/mcs/class/System/System.Net/WebResponseStream.cs
@@ -81,7 +81,6 @@ public WebResponseStream (WebRequestStream request)
 			: base (request.Connection, request.Operation, request.InnerStream)
 		{
 			RequestStream = request;
-			request.InnerStream.ReadTimeout = ReadTimeout;
 
 #if MONO_WEB_DEBUG
 			ME = $"WRP(Cnc={Connection.ID}, Op={Operation.ID})";

Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,8 @@ internal async Task<WebRequestStream> InitConnection (WebOperation operation, Ca`
`265`	`265`	`goto retry;`
`266`	`266`	`}`
`267`	`267`
	`268`	`+ networkStream.ReadTimeout = operation.Request.ReadWriteTimeout;`
	`269`	`+`
`268`	`270`	`return new WebRequestStream (this, operation, networkStream, tunnel);`
`269`	`271`	`}`
`270`	`272`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ public WebResponseStream (WebRequestStream request)`
`81`	`81`	`: base (request.Connection, request.Operation, request.InnerStream)`
`82`	`82`	`{`
`83`	`83`	`RequestStream = request;`
`84`		`- request.InnerStream.ReadTimeout = ReadTimeout;`
`85`	`84`
`86`	`85`	`#if MONO_WEB_DEBUG`
`87`	`86`	`ME = $"WRP(Cnc={Connection.ID}, Op={Operation.ID})";`