diff options
| author | UbitUmarov | 2015-08-18 21:32:03 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-18 21:32:03 +0100 |
| commit | 05d72f77ff38585817dead9b4a812ff97a001dce (patch) | |
| tree | 109840c9d524ecddec25b5de2869f68254dd1aa1 /OpenSim/Region | |
| parent | try to serialize http requests from same connection, so they are processed (diff) | |
| download | opensim-SC-05d72f77ff38585817dead9b4a812ff97a001dce.zip opensim-SC-05d72f77ff38585817dead9b4a812ff97a001dce.tar.gz opensim-SC-05d72f77ff38585817dead9b4a812ff97a001dce.tar.bz2 opensim-SC-05d72f77ff38585817dead9b4a812ff97a001dce.tar.xz | |
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.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs index a381a1b..4c15ad8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||
| @@ -264,7 +264,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 264 | response["int_response_code"] = 500; | 264 | response["int_response_code"] = 500; |
| 265 | response["str_response_string"] = "Script timeout"; | 265 | response["str_response_string"] = "Script timeout"; |
| 266 | response["content_type"] = "text/plain"; | 266 | response["content_type"] = "text/plain"; |
| 267 | response["keepalive"] = false; | 267 | response["keepalive"] = true; |
| 268 | response["reusecontext"] = false; | 268 | response["reusecontext"] = false; |
| 269 | 269 | ||
| 270 | return response; | 270 | return response; |
| @@ -285,7 +285,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 285 | response["int_response_code"] = 500; | 285 | response["int_response_code"] = 500; |
| 286 | response["str_response_string"] = "Script timeout"; | 286 | response["str_response_string"] = "Script timeout"; |
| 287 | response["content_type"] = "text/plain"; | 287 | response["content_type"] = "text/plain"; |
| 288 | response["keepalive"] = false; | 288 | response["keepalive"] = true; |
| 289 | response["reusecontext"] = false; | 289 | response["reusecontext"] = false; |
| 290 | 290 | ||
| 291 | lock (responses) | 291 | lock (responses) |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index e053054..656f177 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
| @@ -283,7 +283,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 283 | response["int_response_code"] = 500; | 283 | response["int_response_code"] = 500; |
| 284 | response["str_response_string"] = "Script timeout"; | 284 | response["str_response_string"] = "Script timeout"; |
| 285 | response["content_type"] = "text/plain"; | 285 | response["content_type"] = "text/plain"; |
| 286 | response["keepalive"] = false; | 286 | response["keepalive"] = true; |
| 287 | response["reusecontext"] = false; | 287 | response["reusecontext"] = false; |
| 288 | 288 | ||
| 289 | return response; | 289 | return response; |
| @@ -303,7 +303,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 303 | response["int_response_code"] = 503; | 303 | response["int_response_code"] = 503; |
| 304 | response["str_response_string"] = "Throttled"; | 304 | response["str_response_string"] = "Throttled"; |
| 305 | response["content_type"] = "text/plain"; | 305 | response["content_type"] = "text/plain"; |
| 306 | response["keepalive"] = false; | 306 | response["keepalive"] = true; |
| 307 | response["reusecontext"] = false; | 307 | response["reusecontext"] = false; |
| 308 | 308 | ||
| 309 | lock (responses) | 309 | lock (responses) |
| @@ -320,7 +320,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 320 | response["int_response_code"] = 500; | 320 | response["int_response_code"] = 500; |
| 321 | response["str_response_string"] = "Script timeout"; | 321 | response["str_response_string"] = "Script timeout"; |
| 322 | response["content_type"] = "text/plain"; | 322 | response["content_type"] = "text/plain"; |
| 323 | response["keepalive"] = false; | 323 | response["keepalive"] = true; |
| 324 | response["reusecontext"] = false; | 324 | response["reusecontext"] = false; |
| 325 | 325 | ||
| 326 | lock (responses) | 326 | lock (responses) |