Fix StreamContent handling in request processing (#292)

nanoframework · Feb 28, 2022 · a0ce639 · a0ce639
1 parent 9bac68c
commit a0ce639
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/nanoFramework.System.Net.Http/Http/HttpClientHandler.cs b/nanoFramework.System.Net.Http/Http/HttpClientHandler.cs
@@ -328,7 +328,7 @@ HttpResponseMessage CreateResponseMessage(HttpWebResponse wr, HttpRequestMessage
             {
                 RequestMessage = requestMessage,
                 ReasonPhrase = wr.StatusDescription,
-                Content = new StreamContent(wr.GetResponseStream())
+                Content = new StreamContent(wr.GetResponseStream(), (int)wr.ContentLength)
             };
 
             var headers = wr.Headers;

diff --git a/nanoFramework.System.Net.Http/Http/StreamContent.cs b/nanoFramework.System.Net.Http/Http/StreamContent.cs
@@ -5,6 +5,7 @@
 //
 
 using System.IO;
+using System.Threading;
 
 namespace System.Net.Http
 {
@@ -50,7 +51,7 @@ public StreamContent(
             {
                 throw new ArgumentOutOfRangeException();
             }
-            
+
             _bufferSize = bufferSize;
 
             if (content.CanSeek)
@@ -76,12 +77,25 @@ protected override void SerializeToStream(Stream stream)
                 _contentCopied = true;
             }
 
-            byte[] buffer = new byte[_bufferSize];
+            // need to read from the stream in batches of 2kB
+            byte[] buffer = new byte[2048];
             int read;
+            int totalRead = 0;
 
-            while ((read = _content.Read(buffer, 0, buffer.Length)) != 0)
+            while (totalRead < _bufferSize)
             {
-                stream.Write(buffer, 0, read);
+                read = _content.Read(buffer, 0, buffer.Length);
+
+                if (read == 0)
+                {
+                    // need to let the native layer get more data
+                    Thread.Sleep(10);
+                }
+                else
+                {
+                    totalRead += read;
+                    stream.Write(buffer, 0, read);
+                }
             }
         }