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

View File

@ -605,8 +605,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 = false;
HandleRequest(req, resp); HandleRequest(req, resp);
// !!!HACK ALERT!!! // !!!HACK ALERT!!!

View File

@ -256,26 +256,7 @@ namespace OpenSim.Framework.Servers.HttpServer
_httpResponse.Reason = value; _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; protected IHttpResponse _httpResponse;
private IHttpClientContext _httpClientContext; private IHttpClientContext _httpClientContext;

View File

@ -119,7 +119,6 @@ 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.KeepAlive = false; response.KeepAlive = false;
response.SendChunked = false; response.SendChunked = false;
response.StatusCode = 503; response.StatusCode = 503;

View File

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

View File

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

View File

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