diff options
| author | Melanie Thielker | 2016-06-16 01:48:27 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2016-06-16 01:48:27 +0200 |
| commit | ed168473af59532f80af215b2b233e7a4d906032 (patch) | |
| tree | 940e58dba6a581cf5d5afca5991b0b7b545d9754 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Also make the HGUserManagementModule more amenable to subclassing. (diff) | |
| parent | "reverting" the keep alive changes brought in from avination, to check if tha... (diff) | |
| download | opensim-SC-ed168473af59532f80af215b2b233e7a4d906032.zip opensim-SC-ed168473af59532f80af215b2b233e7a4d906032.tar.gz opensim-SC-ed168473af59532f80af215b2b233e7a4d906032.tar.bz2 opensim-SC-ed168473af59532f80af215b2b233e7a4d906032.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index cd14212..20bdf17 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -461,7 +461,7 @@ 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 = false; | 464 | resp.ReuseContext = true; |
| 465 | HandleRequest(req, resp); | 465 | HandleRequest(req, resp); |
| 466 | 466 | ||
| 467 | // !!!HACK ALERT!!! | 467 | // !!!HACK ALERT!!! |
| @@ -1270,8 +1270,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1270 | requestStream.Close(); | 1270 | requestStream.Close(); |
| 1271 | 1271 | ||
| 1272 | //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody); | 1272 | //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody); |
| 1273 | // response.KeepAlive = true; | 1273 | response.KeepAlive = true; |
| 1274 | response.KeepAlive = false; | ||
| 1275 | 1274 | ||
| 1276 | OSD llsdRequest = null; | 1275 | OSD llsdRequest = null; |
| 1277 | OSD llsdResponse = null; | 1276 | OSD llsdResponse = null; |