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

do keepalive on mesh and texture GET. Dont use reusecontext any where. 

setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
avinationmerge
UbitUmarov 2015-08-18 21:32:03 +01:00
parent 2cac56340a
commit 05d72f77ff
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
View File

@ -61,7 +61,7 @@ namespace OpenSim.Capabilities.Handlers
Hashtable ret = new Hashtable(); Hashtable ret = new Hashtable();
ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound; ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
ret["content_type"] = "text/plain"; ret["content_type"] = "text/plain";
ret["keepalive"] = false; ret["keepalive"] = true;
ret["reusecontext"] = false; ret["reusecontext"] = false;
ret["int_bytes"] = 0; ret["int_bytes"] = 0;
ret["int_lod"] = 0; ret["int_lod"] = 0;
@ -98,7 +98,7 @@ namespace OpenSim.Capabilities.Handlers
Hashtable responsedata = new Hashtable(); Hashtable responsedata = new Hashtable();
responsedata["int_response_code"] = 400; //501; //410; //404; responsedata["int_response_code"] = 400; //501; //410; //404;
responsedata["content_type"] = "text/plain"; responsedata["content_type"] = "text/plain";
responsedata["keepalive"] = false; responsedata["keepalive"] = true;
responsedata["str_response_string"] = "Request wasn't what was expected"; responsedata["str_response_string"] = "Request wasn't what was expected";
responsedata["reusecontext"] = false; responsedata["reusecontext"] = false;
responsedata["int_lod"] = 0; responsedata["int_lod"] = 0;
@ -116,7 +116,7 @@ namespace OpenSim.Capabilities.Handlers
{ {
responsedata["int_response_code"] = 404; //501; //410; //404; responsedata["int_response_code"] = 404; //501; //410; //404;
responsedata["content_type"] = "text/plain"; responsedata["content_type"] = "text/plain";
responsedata["keepalive"] = false; responsedata["keepalive"] = true;
responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh."; responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh.";
responsedata["reusecontext"] = false; responsedata["reusecontext"] = false;
return responsedata; return responsedata;
@ -152,7 +152,7 @@ namespace OpenSim.Capabilities.Handlers
{ {
responsedata["int_response_code"] = 404; //501; //410; //404; responsedata["int_response_code"] = 404; //501; //410; //404;
responsedata["content_type"] = "text/plain"; responsedata["content_type"] = "text/plain";
responsedata["keepalive"] = false; responsedata["keepalive"] = true;
responsedata["str_response_string"] = "This range doesnt exist."; responsedata["str_response_string"] = "This range doesnt exist.";
responsedata["reusecontext"] = false; responsedata["reusecontext"] = false;
responsedata["int_lod"] = 3; responsedata["int_lod"] = 3;
@ -228,7 +228,7 @@ namespace OpenSim.Capabilities.Handlers
{ {
responsedata["int_response_code"] = 404; //501; //410; //404; responsedata["int_response_code"] = 404; //501; //410; //404;
responsedata["content_type"] = "text/plain"; responsedata["content_type"] = "text/plain";
responsedata["keepalive"] = false; responsedata["keepalive"] = true;
responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh."; responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
responsedata["reusecontext"] = false; responsedata["reusecontext"] = false;
responsedata["int_lod"] = 1; responsedata["int_lod"] = 1;
@ -239,7 +239,7 @@ namespace OpenSim.Capabilities.Handlers
{ {
responsedata["int_response_code"] = 404; //501; //410; //404; responsedata["int_response_code"] = 404; //501; //410; //404;
responsedata["content_type"] = "text/plain"; responsedata["content_type"] = "text/plain";
responsedata["keepalive"] = false; responsedata["keepalive"] = true;
responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!"; responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!";
responsedata["reusecontext"] = false; responsedata["reusecontext"] = false;
responsedata["int_lod"] = 0; responsedata["int_lod"] = 0;

4
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Capabilities.Handlers
Hashtable ret = new Hashtable(); Hashtable ret = new Hashtable();
ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound; ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
ret["content_type"] = "text/plain"; ret["content_type"] = "text/plain";
ret["keepalive"] = false; ret["keepalive"] = true;
ret["reusecontext"] = false; ret["reusecontext"] = false;
ret["int_bytes"] = 0; ret["int_bytes"] = 0;
string textureStr = (string)request["texture_id"]; string textureStr = (string)request["texture_id"];
@ -112,7 +112,7 @@ namespace OpenSim.Capabilities.Handlers
ret["error_status_text"] = "not found"; ret["error_status_text"] = "not found";
ret["str_response_string"] = "not found"; ret["str_response_string"] = "not found";
ret["content_type"] = "text/plain"; ret["content_type"] = "text/plain";
ret["keepalive"] = false; ret["keepalive"] = true;
ret["reusecontext"] = false; ret["reusecontext"] = false;
ret["int_bytes"] = 0; ret["int_bytes"] = 0;
} }

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

@ -459,7 +459,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!!!

4
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
View File

@ -264,7 +264,7 @@ namespace OpenSim.Region.ClientStack.Linden
response["int_response_code"] = 500; response["int_response_code"] = 500;
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"] = true;
response["reusecontext"] = false; response["reusecontext"] = false;
return response; return response;
@ -285,7 +285,7 @@ namespace OpenSim.Region.ClientStack.Linden
response["int_response_code"] = 500; response["int_response_code"] = 500;
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"] = true;
response["reusecontext"] = false; response["reusecontext"] = false;
lock (responses) lock (responses)

6
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@ -283,7 +283,7 @@ namespace OpenSim.Region.ClientStack.Linden
response["int_response_code"] = 500; response["int_response_code"] = 500;
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"] = true;
response["reusecontext"] = false; response["reusecontext"] = false;
return response; return response;
@ -303,7 +303,7 @@ namespace OpenSim.Region.ClientStack.Linden
response["int_response_code"] = 503; response["int_response_code"] = 503;
response["str_response_string"] = "Throttled"; response["str_response_string"] = "Throttled";
response["content_type"] = "text/plain"; response["content_type"] = "text/plain";
response["keepalive"] = false; response["keepalive"] = true;
response["reusecontext"] = false; response["reusecontext"] = false;
lock (responses) lock (responses)
@ -320,7 +320,7 @@ namespace OpenSim.Region.ClientStack.Linden
response["int_response_code"] = 500; response["int_response_code"] = 500;
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"] = true;
response["reusecontext"] = false; response["reusecontext"] = false;
lock (responses) lock (responses)