aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-16 03:43:45 +0100
committerJustin Clark-Casey (justincc)2012-06-16 03:43:45 +0100
commited513fc7bee7945a71ad9cb66d83ac68335a7774 (patch)
treee10dae67c8ac0e7b8c83f6c27665fd69c7b702dd
parentImplement max_external_urls_per_simulator setting in [LL-Functions] to allow ... (diff)
downloadopensim-SC_OLD-ed513fc7bee7945a71ad9cb66d83ac68335a7774.zip
opensim-SC_OLD-ed513fc7bee7945a71ad9cb66d83ac68335a7774.tar.gz
opensim-SC_OLD-ed513fc7bee7945a71ad9cb66d83ac68335a7774.tar.bz2
opensim-SC_OLD-ed513fc7bee7945a71ad9cb66d83ac68335a7774.tar.xz
Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses would always return OK even if some other status code had been set
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 2995421..35a8dee 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -129,9 +129,7 @@ namespace OpenSim.Framework.Servers.HttpServer
129 OSHttpResponse response 129 OSHttpResponse response
130 = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext); 130 = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
131 131
132 byte[] buffer 132 byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
133 = server.DoHTTPGruntWork(
134 responsedata, new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
135 133
136 response.SendChunked = false; 134 response.SendChunked = false;
137 response.ContentLength64 = buffer.Length; 135 response.ContentLength64 = buffer.Length;