diff options
| author | UbitUmarov | 2016-09-03 07:51:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-09-03 07:51:53 +0100 |
| commit | 9aec227767cf726216514d0494f11b5d8bf5b807 (patch) | |
| tree | 8f308f4c1eefa19954fc30a560ac780f8a8e916a /OpenSim/Framework/Servers/HttpServer | |
| parent | merge issue (diff) | |
| parent | tests making sure evering thing is coerently wrong.. (diff) | |
| download | opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.zip opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.gz opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.bz2 opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 1ac5059..e431042 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -461,8 +461,8 @@ 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 = true; | 464 | resp.ReuseContext = true; |
| 465 | resp.ReuseContext = false; | 465 | // resp.ReuseContext = false; |
| 466 | HandleRequest(req, resp); | 466 | HandleRequest(req, resp); |
| 467 | 467 | ||
| 468 | // !!!HACK ALERT!!! | 468 | // !!!HACK ALERT!!! |