Merge pull request #2907 from dotnet-bot/from-tfs

Merge changes from TFS

Author: nguerrera

src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs

@@ -1190,7 +1190,7 @@ private async void StartRequest(object obj)
                         await state.RequestMessage.Content.CopyToAsync(
                             requestStream,
                             state.TransportContext).ConfigureAwait(false);
-                        requestStream.Flush();
+                        requestStream.EndUpload();
                     }
 
                     state.CancellationToken.ThrowIfCancellationRequested();

src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpRequestStream.cs

@@ -77,10 +77,6 @@ public override long Position
 
         public override void Flush()
         {
-            if (_chunkedMode)
-            {
-                WriteData(s_endChunk, 0, s_endChunk.Length);
-            }
         }
 
         public override void Write(byte[] buffer, int offset, int count)
@@ -128,6 +124,14 @@ public override int Read(byte[] buffer, int offset, int count)
             throw new NotSupportedException();
         }
 
+        internal void EndUpload()
+        {
+            if (_chunkedMode)
+            {
+                WriteData(s_endChunk, 0, s_endChunk.Length);
+            }
+        }
+        
         protected override void Dispose(bool disposing)
         {
             if (disposing && !_disposed)