OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of opensimulator.org:/var/git/opensim

LSLKeyTest
Melanie Thielker 2016-06-16 01:48:27 +02:00
parent d2f61f5320 e0a82a82de
commit ed168473af
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -461,7 +461,7 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
resp.ReuseContext = false; resp.ReuseContext = true;
HandleRequest(req, resp); HandleRequest(req, resp);
// !!!HACK ALERT!!! // !!!HACK ALERT!!!
@ -1270,8 +1270,7 @@ namespace OpenSim.Framework.Servers.HttpServer
requestStream.Close(); requestStream.Close();
//m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody); //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
// response.KeepAlive = true; response.KeepAlive = true;
response.KeepAlive = false;
OSD llsdRequest = null; OSD llsdRequest = null;
OSD llsdResponse = null; OSD llsdResponse = null;

4
OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
View File

@ -322,10 +322,6 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
_httpResponse.Body.Flush(); _httpResponse.Body.Flush();
// disable this till they are safe to use
_httpResponse.Connection = ConnectionType.Close;
_httpResponse.Chunked = false;
_httpResponse.Send(); _httpResponse.Send();
} }