From ca404e50015141b53a7cb82e05ef7ec3d311d8cf Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 12 Sep 2018 13:48:29 +0100 Subject: some cleanup --- .../Framework/Servers/HttpServer/BaseHttpServer.cs | 1 - .../Framework/Servers/HttpServer/OSHttpResponse.cs | 2 -- .../Servers/HttpServer/PollServiceHttpRequest.cs | 21 +-------------------- 3 files changed, 1 insertion(+), 23 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 2819bc9..4c9b19d 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -756,7 +756,6 @@ namespace OpenSim.Framework.Servers.HttpServer using (MemoryStream memoryStream = new MemoryStream()) { streamHandler.Handle(path, request.InputStream, memoryStream, request, response); - memoryStream.Flush(); buffer = memoryStream.ToArray(); } } diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index a107ced..b26321b 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs @@ -301,8 +301,6 @@ namespace OpenSim.Framework.Servers.HttpServer /// public void Send() { - _httpResponse.Body.Flush(); - _httpResponse.Send(); } diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index 4fd69f3..4ea7692 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs @@ -96,7 +96,6 @@ namespace OpenSim.Framework.Servers.HttpServer try { response.OutputStream.Write(buffer, 0, buffer.Length); - response.OutputStream.Flush(); response.Send(); buffer = null; } @@ -123,7 +122,6 @@ namespace OpenSim.Framework.Servers.HttpServer if(Request.Body.CanRead) Request.Body.Dispose(); - response.SendChunked = false; response.ContentLength64 = 0; response.ContentEncoding = Encoding.UTF8; response.KeepAlive = false; @@ -132,7 +130,6 @@ namespace OpenSim.Framework.Servers.HttpServer try { - response.OutputStream.Flush(); response.Send(); } catch @@ -140,20 +137,4 @@ namespace OpenSim.Framework.Servers.HttpServer } } } - - class PollServiceHttpRequestComparer : IEqualityComparer - { - public bool Equals(PollServiceHttpRequest b1, PollServiceHttpRequest b2) - { - if (b1.contextHash != b2.contextHash) - return false; - bool b = Object.ReferenceEquals(b1.HttpContext, b2.HttpContext); - return b; - } - - public int GetHashCode(PollServiceHttpRequest b2) - { - return (int)b2.contextHash; - } - } -} +} \ No newline at end of file -- cgit v1.1