Merge pull request #2739 from MediaBrowser/beta

Beta

1 files changed, 10 insertions, 2 deletions

diff --git a/SocketHttpListener/Net/ChunkedInputStream.cs b/SocketHttpListener/Net/ChunkedInputStream.cs
index 2e0e1964b..919bd95ea 100644
--- a/SocketHttpListener/Net/ChunkedInputStream.cs
+++ b/SocketHttpListener/Net/ChunkedInputStream.cs
@@ -122,11 +122,19 @@ namespace SocketHttpListener.Net
             try
             {
                 int nread = base.EndRead(base_ares);
+                if (nread == 0)
+                {
+                    _no_more_data = true;
+                    ares._count = rb.InitialCount - rb.Count;
+                    ares.Complete();
+                    return;
+                }
+
                 _decoder.Write(ares._buffer, ares._offset, nread);
                 nread = _decoder.Read(rb.Buffer, rb.Offset, rb.Count);
                 rb.Offset += nread;
                 rb.Count -= nread;
-                if (rb.Count == 0 || !_decoder.WantMore || nread == 0)
+                if (rb.Count == 0 || !_decoder.WantMore)
                 {
                     _no_more_data = !_decoder.WantMore && nread == 0;
                     ares._count = rb.InitialCount - rb.Count;
@@ -164,7 +172,7 @@ namespace SocketHttpListener.Net
                 asyncResult.AsyncWaitHandle.WaitOne();
 
             if (ares._error != null)
-                throw new HttpListenerException((int)HttpStatusCode.BadRequest, "Bad Request");
+                throw new HttpListenerException((int)HttpStatusCode.BadRequest, "Operation aborted");
 
             return ares._count;
         }