diff options
Diffstat (limited to '')
3 files changed, 2 insertions, 23 deletions
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 | |||
605 | } | 605 | } |
606 | 606 | ||
607 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); | 607 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); |
608 | // resp.ReuseContext = true; | 608 | |
609 | // resp.ReuseContext = false; | ||
610 | HandleRequest(req, resp); | 609 | HandleRequest(req, resp); |
611 | 610 | ||
612 | // !!!HACK ALERT!!! | 611 | // !!!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 | |||
256 | _httpResponse.Reason = value; | 256 | _httpResponse.Reason = value; |
257 | } | 257 | } |
258 | } | 258 | } |
259 | /* | 259 | |
260 | public bool ReuseContext | ||
261 | { | ||
262 | get | ||
263 | { | ||
264 | if (_httpClientContext != null) | ||
265 | { | ||
266 | return !_httpClientContext.EndWhenDone; | ||
267 | } | ||
268 | return true; | ||
269 | } | ||
270 | set | ||
271 | { | ||
272 | if (_httpClientContext != null) | ||
273 | { | ||
274 | _httpClientContext.EndWhenDone = !value; | ||
275 | } | ||
276 | } | ||
277 | } | ||
278 | */ | ||
279 | protected IHttpResponse _httpResponse; | 260 | protected IHttpResponse _httpResponse; |
280 | private IHttpClientContext _httpClientContext; | 261 | private IHttpClientContext _httpClientContext; |
281 | 262 | ||
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 | |||
119 | response.SendChunked = false; | 119 | response.SendChunked = false; |
120 | response.ContentLength64 = 0; | 120 | response.ContentLength64 = 0; |
121 | response.ContentEncoding = Encoding.UTF8; | 121 | response.ContentEncoding = Encoding.UTF8; |
122 | // response.ReuseContext = false; | ||
123 | response.KeepAlive = false; | 122 | response.KeepAlive = false; |
124 | response.SendChunked = false; | 123 | response.SendChunked = false; |
125 | response.StatusCode = 503; | 124 | response.StatusCode = 503; |