OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

httptests
UbitUmarov 2016-09-03 08:50:22 +01:00
parent 9aec227767
commit 4f9378bf97
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -461,7 +461,7 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
resp.ReuseContext = true; // resp.ReuseContext = true;
// resp.ReuseContext = false; // resp.ReuseContext = false;
HandleRequest(req, resp); HandleRequest(req, resp);
@ -1804,7 +1804,7 @@ namespace OpenSim.Framework.Servers.HttpServer
*/ */
// disable this things // disable this things
response.KeepAlive = false; response.KeepAlive = false;
response.ReuseContext = false; // response.ReuseContext = false;
// Cross-Origin Resource Sharing with simple requests // Cross-Origin Resource Sharing with simple requests
if (responsedata.ContainsKey("access_control_allow_origin")) if (responsedata.ContainsKey("access_control_allow_origin"))

2
OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
View File

@ -118,7 +118,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// </summary> /// </summary>
string StatusDescription { get; set; } string StatusDescription { get; set; }
bool ReuseContext { get; set; } // bool ReuseContext { get; set; }
/// <summary> /// <summary>
/// Add a header field and content to the response. /// Add a header field and content to the response.

4
OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
View File

@ -256,7 +256,7 @@ namespace OpenSim.Framework.Servers.HttpServer
_httpResponse.Reason = value; _httpResponse.Reason = value;
} }
} }
/*
public bool ReuseContext public bool ReuseContext
{ {
get get
@ -275,7 +275,7 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
} }
*/
protected IHttpResponse _httpResponse; protected IHttpResponse _httpResponse;
private IHttpClientContext _httpClientContext; private IHttpClientContext _httpClientContext;

4
OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
View File

@ -89,7 +89,7 @@ namespace OpenSim.Framework.Servers.HttpServer
response.SendChunked = false; response.SendChunked = false;
response.ContentLength64 = buffer.Length; response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8; response.ContentEncoding = Encoding.UTF8;
response.ReuseContext = false; // response.ReuseContext = false;
try try
{ {
@ -114,7 +114,7 @@ namespace OpenSim.Framework.Servers.HttpServer
response.SendChunked = false; response.SendChunked = false;
response.ContentLength64 = 0; response.ContentLength64 = 0;
response.ContentEncoding = Encoding.UTF8; response.ContentEncoding = Encoding.UTF8;
response.ReuseContext = false; // response.ReuseContext = false;
response.KeepAlive = false; response.KeepAlive = false;
response.SendChunked = false; response.SendChunked = false;
response.StatusCode = 503; response.StatusCode = 503;