diff options
author | UbitUmarov | 2016-09-03 08:50:22 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-03 08:50:22 +0100 |
commit | 4f9378bf97b69567f8bfb06cb8764405443464ec (patch) | |
tree | 6a0d5d39f58d47b46caaa8c2204e4727f8297d20 /OpenSim/Framework/Servers | |
parent | Merge branch 'master' into httptests (diff) | |
download | opensim-SC-4f9378bf97b69567f8bfb06cb8764405443464ec.zip opensim-SC-4f9378bf97b69567f8bfb06cb8764405443464ec.tar.gz opensim-SC-4f9378bf97b69567f8bfb06cb8764405443464ec.tar.bz2 opensim-SC-4f9378bf97b69567f8bfb06cb8764405443464ec.tar.xz |
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
Diffstat (limited to '')
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index e431042..c078a73 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -461,7 +461,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
461 | } | 461 | } |
462 | 462 | ||
463 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); | 463 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); |
464 | resp.ReuseContext = true; | 464 | // resp.ReuseContext = true; |
465 | // resp.ReuseContext = false; | 465 | // resp.ReuseContext = false; |
466 | HandleRequest(req, resp); | 466 | HandleRequest(req, resp); |
467 | 467 | ||
@@ -1804,7 +1804,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1804 | */ | 1804 | */ |
1805 | // disable this things | 1805 | // disable this things |
1806 | response.KeepAlive = false; | 1806 | response.KeepAlive = false; |
1807 | response.ReuseContext = false; | 1807 | // response.ReuseContext = false; |
1808 | 1808 | ||
1809 | // Cross-Origin Resource Sharing with simple requests | 1809 | // Cross-Origin Resource Sharing with simple requests |
1810 | if (responsedata.ContainsKey("access_control_allow_origin")) | 1810 | 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 f61b090..d26b68a 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 | |||
118 | /// </summary> | 118 | /// </summary> |
119 | string StatusDescription { get; set; } | 119 | string StatusDescription { get; set; } |
120 | 120 | ||
121 | bool ReuseContext { get; set; } | 121 | // bool ReuseContext { get; set; } |
122 | 122 | ||
123 | /// <summary> | 123 | /// <summary> |
124 | /// Add a header field and content to the response. | 124 | /// 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 ccf9c91..8456654 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | |||
@@ -256,7 +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 | 260 | public bool ReuseContext |
261 | { | 261 | { |
262 | get | 262 | get |
@@ -275,7 +275,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
275 | } | 275 | } |
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | */ | |
279 | protected IHttpResponse _httpResponse; | 279 | protected IHttpResponse _httpResponse; |
280 | private IHttpClientContext _httpClientContext; | 280 | private IHttpClientContext _httpClientContext; |
281 | 281 | ||
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index 9083e12..6537f64 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
89 | response.SendChunked = false; | 89 | response.SendChunked = false; |
90 | response.ContentLength64 = buffer.Length; | 90 | response.ContentLength64 = buffer.Length; |
91 | response.ContentEncoding = Encoding.UTF8; | 91 | response.ContentEncoding = Encoding.UTF8; |
92 | response.ReuseContext = false; | 92 | // response.ReuseContext = false; |
93 | 93 | ||
94 | try | 94 | try |
95 | { | 95 | { |
@@ -114,7 +114,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
114 | response.SendChunked = false; | 114 | response.SendChunked = false; |
115 | response.ContentLength64 = 0; | 115 | response.ContentLength64 = 0; |
116 | response.ContentEncoding = Encoding.UTF8; | 116 | response.ContentEncoding = Encoding.UTF8; |
117 | response.ReuseContext = false; | 117 | // response.ReuseContext = false; |
118 | response.KeepAlive = false; | 118 | response.KeepAlive = false; |
119 | response.SendChunked = false; | 119 | response.SendChunked = false; |
120 | response.StatusCode = 503; | 120 | response.StatusCode = 503; |