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

http reusecontext is obsolete

0.9.1.0-post-fixes
UbitUmarov 2018-07-14 21:48:59 +01:00
parent ee2eed8c6f
commit aee981e5e2
6 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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!!!

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

@ -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;

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

@ -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;

3
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -520,7 +520,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
response["str_response_string"] = "Script timeout";
response["content_type"] = "text/plain";
response["keepalive"] = false;
response["reusecontext"] = false;
//remove from map
lock (url.requests)
@ -619,7 +618,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
response["str_response_string"] = "Script timeout";
response["content_type"] = "text/plain";
response["keepalive"] = false;
response["reusecontext"] = false;
return response;
}
//put response
@ -627,7 +625,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
response["str_response_string"] = requestData.responseBody;
response["content_type"] = requestData.responseType;
response["keepalive"] = false;
response["reusecontext"] = false;
if (url.allowXss)
response["access_control_allow_origin"] = "*";

1
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@ -549,7 +549,6 @@ namespace SecondLife
parameters.TreatWarningsAsErrors = false;
parameters.GenerateInMemory = false;
// this seems to cause issues on some windows servers
// parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath,
// m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation);

2
OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs
View File

@ -117,8 +117,6 @@ namespace OpenSim.Tests.Common
/// </summary>
public string StatusDescription { get; set; }
public bool ReuseContext { get; set; }
/// <summary>
/// Add a header field and content to the response.
/// </summary>