Stop streams on finish

Can't use dispose (or close) as can be disposed too early by user code Resolves #263
dotnet · Nov 17, 2015 · f60f6c9 · f60f6c9
1 parent 8c0a170
commit f60f6c9
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
@@ -204,8 +204,10 @@ public async Task RequestProcessingAsync()
                     {
                         MessageBody = MessageBody.For(HttpVersion, _requestHeaders, this);
                         _keepAlive = MessageBody.RequestKeepAlive;
-                        RequestBody = new FrameRequestStream(MessageBody);
-                        ResponseBody = new FrameResponseStream(this);
+                        var requestBody = new FrameRequestStream(MessageBody);
+                        RequestBody = requestBody;
+                        var responseBody = new FrameResponseStream(this);
+                        ResponseBody = responseBody;
                         DuplexStream = new FrameDuplexStream(RequestBody, ResponseBody);
 
                         var httpContext = HttpContextFactory.Create(this);
@@ -236,6 +238,9 @@ public async Task RequestProcessingAsync()
 
                             // Finish reading the request body in case the app did not.
                             await MessageBody.Consume();
+
+                            requestBody.StopAcceptingReads();
+                            responseBody.StopAcceptingWrites();
                         }
 
                         terminated = !_keepAlive;

diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
@@ -11,6 +11,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
     public class FrameRequestStream : Stream
     {
         private readonly MessageBody _body;
+        private bool _stopped;
 
         public FrameRequestStream(MessageBody body)
         {
@@ -50,12 +51,22 @@ public override void SetLength(long value)
 
         public override int Read(byte[] buffer, int offset, int count)
         {
+            if (_stopped)
+            {
+                throw new ObjectDisposedException("RequestStream has been disposed");
+            }
+
             return ReadAsync(buffer, offset, count).GetAwaiter().GetResult();
         }
 
 #if NET451
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
+            if (_stopped)
+            {
+                throw new ObjectDisposedException("RequestStream has been disposed");
+            }
+
             var task = ReadAsync(buffer, offset, count, CancellationToken.None, state);
             if (callback != null)
             {
@@ -71,6 +82,11 @@ public override int EndRead(IAsyncResult asyncResult)
 
         private Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken, object state)
         {
+            if (_stopped)
+            {
+                throw new ObjectDisposedException("RequestStream has been disposed");
+            }
+
             var tcs = new TaskCompletionSource<int>(state);
             var task = _body.ReadAsync(new ArraySegment<byte>(buffer, offset, count), cancellationToken);
             task.ContinueWith((task2, state2) =>
@@ -102,5 +118,10 @@ public override void Write(byte[] buffer, int offset, int count)
         {
             throw new NotImplementedException();
         }
+
+        public void StopAcceptingReads()
+        {
+            _stopped = true;
+        }
     }
 }
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameResponseStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameResponseStream.cs
@@ -11,6 +11,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
     class FrameResponseStream : Stream
     {
         private readonly FrameContext _context;
+        private bool _stopped;
 
         public FrameResponseStream(FrameContext context)
         {
@@ -35,11 +36,21 @@ public override long Length
 
         public override void Flush()
         {
+            if (_stopped)
+            {
+                throw new ObjectDisposedException("ResponseStream has been disposed");
+            }
+
             _context.FrameControl.Flush();
         }
 
         public override Task FlushAsync(CancellationToken cancellationToken)
         {
+            if (_stopped)
+            {
+                throw new ObjectDisposedException("ResponseStream has been disposed");
+            }
+
             return _context.FrameControl.FlushAsync(cancellationToken);
         }
 
@@ -60,12 +71,27 @@ public override int Read(byte[] buffer, int offset, int count)
 
         public override void Write(byte[] buffer, int offset, int count)
         {
+            if (_stopped)
+            {
+                throw new ObjectDisposedException("ResponseStream has been disposed");
+            }
+
             _context.FrameControl.Write(new ArraySegment<byte>(buffer, offset, count));
         }
 
         public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
+            if (_stopped)
+            {
+                throw new ObjectDisposedException("ResponseStream has been disposed");
+            }
+
             return _context.FrameControl.WriteAsync(new ArraySegment<byte>(buffer, offset, count), cancellationToken);
         }
+
+        public void StopAcceptingWrites()
+        {
+            _stopped = true;
+        }
     }
 }