Merge pull request #2739 from MediaBrowser/beta

Beta

1 files changed, 17 insertions, 16 deletions

diff --git a/SocketHttpListener/Net/HttpResponseStream.Managed.cs b/SocketHttpListener/Net/HttpResponseStream.Managed.cs
index 42db03e47..116c3280a 100644
--- a/SocketHttpListener/Net/HttpResponseStream.Managed.cs
+++ b/SocketHttpListener/Net/HttpResponseStream.Managed.cs
@@ -132,27 +132,28 @@ namespace SocketHttpListener.Net
 
         private MemoryStream GetHeaders(bool closing, bool isWebSocketHandshake = false)
         {
+            //// SendHeaders works on shared headers
+            //lock (_response.headers_lock)
+            //{
+            //    if (_response.HeadersSent)
+            //        return null;
+            //    var ms = _memoryStreamFactory.CreateNew();
+            //    _response.SendHeaders(closing, ms);
+            //    return ms;
+            //}
+
             // SendHeaders works on shared headers
-            lock (_response.headers_lock)
+            lock (_response._headersLock)
             {
-                if (_response.HeadersSent)
+                if (_response.SentHeaders)
+                {
                     return null;
-                var ms = _memoryStreamFactory.CreateNew();
-                _response.SendHeaders(closing, ms);
+                }
+
+                MemoryStream ms = new MemoryStream();
+                _response.SendHeaders(closing, ms, isWebSocketHandshake);
                 return ms;
             }
-
-            //lock (_response._headersLock)
-            //{
-            //    if (_response.SentHeaders)
-            //    {
-            //        return null;
-            //    }
-
-            //    MemoryStream ms = new MemoryStream();
-            //    _response.SendHeaders(closing, ms, isWebSocketHandshake);
-            //    return ms;
-            //}
         }
 
         private static byte[] s_crlf = new byte[] { 13, 10 };