From aee981e5e2c0bbbfc5c6e840fe13fb107bc47804 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 14 Jul 2018 21:48:59 +0100 Subject: http reusecontext is obsolete --- .../Framework/Servers/HttpServer/BaseHttpServer.cs | 3 +-- .../Framework/Servers/HttpServer/OSHttpResponse.cs | 21 +-------------------- .../Servers/HttpServer/PollServiceHttpRequest.cs | 1 - 3 files changed, 2 insertions(+), 23 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ca67d84..79f4952 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -605,8 +605,7 @@ namespace OpenSim.Framework.Servers.HttpServer } OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); -// resp.ReuseContext = true; -// resp.ReuseContext = false; + HandleRequest(req, resp); // !!!HACK ALERT!!! diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index 8e1b545..a107ced 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs @@ -256,26 +256,7 @@ namespace OpenSim.Framework.Servers.HttpServer _httpResponse.Reason = value; } } -/* - public bool ReuseContext - { - get - { - if (_httpClientContext != null) - { - return !_httpClientContext.EndWhenDone; - } - return true; - } - set - { - if (_httpClientContext != null) - { - _httpClientContext.EndWhenDone = !value; - } - } - } -*/ + protected IHttpResponse _httpResponse; private IHttpClientContext _httpClientContext; diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index 7f24ebd..1e2e2e3 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs @@ -119,7 +119,6 @@ namespace OpenSim.Framework.Servers.HttpServer response.SendChunked = false; response.ContentLength64 = 0; response.ContentEncoding = Encoding.UTF8; -// response.ReuseContext = false; response.KeepAlive = false; response.SendChunked = false; response.StatusCode = 503; -- cgit v1.1