From 4f9378bf97b69567f8bfb06cb8764405443464ec Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 3 Sep 2016 08:50:22 +0100 Subject: [PATCH] remove reuse context code, they had notthing worth using and on original code when reusing contexts still in use, etc. Change DLL information to make clear it is a opensim fork, so our responsability not original author --- OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 4 ++-- .../Servers/HttpServer/Interfaces/IOSHttpResponse.cs | 2 +- OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | 4 ++-- .../Framework/Servers/HttpServer/PollServiceHttpRequest.cs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index e431042c70..c078a730e4 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -461,7 +461,7 @@ namespace OpenSim.Framework.Servers.HttpServer } OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); - resp.ReuseContext = true; +// resp.ReuseContext = true; // resp.ReuseContext = false; HandleRequest(req, resp); @@ -1804,7 +1804,7 @@ namespace OpenSim.Framework.Servers.HttpServer */ // disable this things response.KeepAlive = false; - response.ReuseContext = false; + // response.ReuseContext = false; // Cross-Origin Resource Sharing with simple requests if (responsedata.ContainsKey("access_control_allow_origin")) diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs index f61b090be4..d26b68a7fb 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs @@ -118,7 +118,7 @@ namespace OpenSim.Framework.Servers.HttpServer /// string StatusDescription { get; set; } - bool ReuseContext { get; set; } +// bool ReuseContext { get; set; } /// /// Add a header field and content to the response. diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index ccf9c9149d..8456654524 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs @@ -256,7 +256,7 @@ namespace OpenSim.Framework.Servers.HttpServer _httpResponse.Reason = value; } } - +/* public bool ReuseContext { get @@ -275,7 +275,7 @@ namespace OpenSim.Framework.Servers.HttpServer } } } - +*/ protected IHttpResponse _httpResponse; private IHttpClientContext _httpClientContext; diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index 9083e12601..6537f64871 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs @@ -89,7 +89,7 @@ namespace OpenSim.Framework.Servers.HttpServer response.SendChunked = false; response.ContentLength64 = buffer.Length; response.ContentEncoding = Encoding.UTF8; - response.ReuseContext = false; +// response.ReuseContext = false; try { @@ -114,7 +114,7 @@ namespace OpenSim.Framework.Servers.HttpServer response.SendChunked = false; response.ContentLength64 = 0; response.ContentEncoding = Encoding.UTF8; - response.ReuseContext = false; +// response.ReuseContext = false; response.KeepAlive = false; response.SendChunked = false; response.StatusCode = 503;