From ed513fc7bee7945a71ad9cb66d83ac68335a7774 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Jun 2012 03:43:45 +0100
Subject: 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

---
 OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs')

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
             OSHttpResponse response
                 = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
 
-            byte[] buffer
-                = server.DoHTTPGruntWork(
-                    responsedata, new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
+            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
 
             response.SendChunked = false;
             response.ContentLength64 = buffer.Length;
-- 
cgit v1.1