From ccb5b14d772c2d1028fa9003ee64fde3cd4196b3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 15 Jun 2017 13:22:05 -0400 Subject: update series resolver --- .../Net/HttpResponseStream.Managed.cs | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'SocketHttpListener/Net/HttpResponseStream.Managed.cs') 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 }; -- cgit v1.2.3