From e0a82a82de6fbd62cbcf7a18f5d9b398109948fd Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Tue, 14 Jun 2016 08:58:37 -0700
Subject: [PATCH] "reverting" the keep alive changes brought in from avination,
 to check if that's what's making osgrid fail. This is not really reverting,
 it's more manually resetting some places (not all) where keep alive is set.

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 5 ++---
 OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index cd14212d21..20bdf17320 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -461,7 +461,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-            resp.ReuseContext = false;
+            resp.ReuseContext = true;
             HandleRequest(req, resp);           
 
             // !!!HACK ALERT!!!
@@ -1270,8 +1270,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             requestStream.Close();
 
             //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
-            // response.KeepAlive = true;
-            response.KeepAlive = false;
+            response.KeepAlive = true;
 
             OSD llsdRequest = null;
             OSD llsdResponse = null;
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index 17e9dc20ee..ccf9c9149d 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -322,10 +322,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             _httpResponse.Body.Flush();
 
-            // disable this till they are safe to use
-            _httpResponse.Connection = ConnectionType.Close;
-            _httpResponse.Chunked = false;
-
             _httpResponse.Send();
         }