diff options
author | UbitUmarov | 2018-07-14 21:48:59 +0100 |
---|---|---|
committer | UbitUmarov | 2018-07-14 21:48:59 +0100 |
commit | aee981e5e2c0bbbfc5c6e840fe13fb107bc47804 (patch) | |
tree | 12395a70198eb03f75a8ec95cbfe2409314832ce | |
parent | http reusecontext is obsolete (diff) | |
download | opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.zip opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.tar.gz opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.tar.bz2 opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.tar.xz |
http reusecontext is obsolete
Diffstat (limited to '')
6 files changed, 2 insertions, 29 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; |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 5f72733..31c317c 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -520,7 +520,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
520 | response["str_response_string"] = "Script timeout"; | 520 | response["str_response_string"] = "Script timeout"; |
521 | response["content_type"] = "text/plain"; | 521 | response["content_type"] = "text/plain"; |
522 | response["keepalive"] = false; | 522 | response["keepalive"] = false; |
523 | response["reusecontext"] = false; | ||
524 | 523 | ||
525 | //remove from map | 524 | //remove from map |
526 | lock (url.requests) | 525 | lock (url.requests) |
@@ -619,7 +618,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
619 | response["str_response_string"] = "Script timeout"; | 618 | response["str_response_string"] = "Script timeout"; |
620 | response["content_type"] = "text/plain"; | 619 | response["content_type"] = "text/plain"; |
621 | response["keepalive"] = false; | 620 | response["keepalive"] = false; |
622 | response["reusecontext"] = false; | ||
623 | return response; | 621 | return response; |
624 | } | 622 | } |
625 | //put response | 623 | //put response |
@@ -627,7 +625,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
627 | response["str_response_string"] = requestData.responseBody; | 625 | response["str_response_string"] = requestData.responseBody; |
628 | response["content_type"] = requestData.responseType; | 626 | response["content_type"] = requestData.responseType; |
629 | response["keepalive"] = false; | 627 | response["keepalive"] = false; |
630 | response["reusecontext"] = false; | ||
631 | 628 | ||
632 | if (url.allowXss) | 629 | if (url.allowXss) |
633 | response["access_control_allow_origin"] = "*"; | 630 | response["access_control_allow_origin"] = "*"; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 89211a5..1345956 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -549,7 +549,6 @@ namespace SecondLife | |||
549 | parameters.TreatWarningsAsErrors = false; | 549 | parameters.TreatWarningsAsErrors = false; |
550 | parameters.GenerateInMemory = false; | 550 | parameters.GenerateInMemory = false; |
551 | 551 | ||
552 | // this seems to cause issues on some windows servers | ||
553 | // parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath, | 552 | // parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath, |
554 | // m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation); | 553 | // m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation); |
555 | 554 | ||
diff --git a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs index 2e17f1e..4577ca3 100644 --- a/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs +++ b/OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs | |||
@@ -117,8 +117,6 @@ namespace OpenSim.Tests.Common | |||
117 | /// </summary> | 117 | /// </summary> |
118 | public string StatusDescription { get; set; } | 118 | public string StatusDescription { get; set; } |
119 | 119 | ||
120 | public bool ReuseContext { get; set; } | ||
121 | |||
122 | /// <summary> | 120 | /// <summary> |
123 | /// Add a header field and content to the response. | 121 | /// Add a header field and content to the response. |
124 | /// </summary> | 122 | /// </summary> |