diff options
author | UbitUmarov | 2016-07-16 20:23:02 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-16 20:23:30 +0100 |
commit | f636ef037aa7bc7754ddb56d121e32e7823c8e73 (patch) | |
tree | 79fb9a226c7f8f81288d822e33bc62060b7aa454 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
parent | simplify http textures and meshs Throttles (diff) | |
download | opensim-SC-f636ef037aa7bc7754ddb56d121e32e7823c8e73.zip opensim-SC-f636ef037aa7bc7754ddb56d121e32e7823c8e73.tar.gz opensim-SC-f636ef037aa7bc7754ddb56d121e32e7823c8e73.tar.bz2 opensim-SC-f636ef037aa7bc7754ddb56d121e32e7823c8e73.tar.xz |
http send is blocking, so we need we need to do it async in all cases. - this will need revision after server changes
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 20bdf17..1ac5059 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -461,7 +461,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
461 | } | 461 | } |
462 | 462 | ||
463 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); | 463 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); |
464 | resp.ReuseContext = true; | 464 | // resp.ReuseContext = true; |
465 | resp.ReuseContext = false; | ||
465 | HandleRequest(req, resp); | 466 | HandleRequest(req, resp); |
466 | 467 | ||
467 | // !!!HACK ALERT!!! | 468 | // !!!HACK ALERT!!! |
@@ -1954,7 +1955,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1954 | 1955 | ||
1955 | // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events | 1956 | // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events |
1956 | 1957 | ||
1957 | PollServiceRequestManager = new PollServiceRequestManager(this, performPollResponsesAsync, 3, 25000); | 1958 | PollServiceRequestManager = new PollServiceRequestManager(this, performPollResponsesAsync, 2, 25000); |
1958 | PollServiceRequestManager.Start(); | 1959 | PollServiceRequestManager.Start(); |
1959 | 1960 | ||
1960 | HTTPDRunning = true; | 1961 | HTTPDRunning = true; |