diff options
| author | Justin Clark-Casey (justincc) | 2010-08-06 22:45:37 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-06 22:45:37 +0100 |
| commit | 204c05974ffceb55b0786eab31aadb231b4dad61 (patch) | |
| tree | 5cbb8926393d92320c4935c1cb075e12adf976f9 /OpenSim/Framework | |
| parent | Add System.Core references to OpenSim.Region.CoreModules.* to fix windows build (diff) | |
| parent | These files want to be committed -- white space weirdness. (diff) | |
| download | opensim-SC_OLD-204c05974ffceb55b0786eab31aadb231b4dad61.zip opensim-SC_OLD-204c05974ffceb55b0786eab31aadb231b4dad61.tar.gz opensim-SC_OLD-204c05974ffceb55b0786eab31aadb231b4dad61.tar.bz2 opensim-SC_OLD-204c05974ffceb55b0786eab31aadb231b4dad61.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ffa30d5..016ab73 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -319,6 +319,13 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 319 | OSHttpRequest req = new OSHttpRequest(context, request); | 319 | OSHttpRequest req = new OSHttpRequest(context, request); |
| 320 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); | 320 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); |
| 321 | HandleRequest(req, resp); | 321 | HandleRequest(req, resp); |
| 322 | |||
| 323 | // !!!HACK ALERT!!! | ||
| 324 | // There seems to be a bug in the underlying http code that makes subsequent requests | ||
| 325 | // come up with trash in Accept headers. Until that gets fixed, we're cleaning them up here. | ||
| 326 | if (request.AcceptTypes != null) | ||
| 327 | for (int i = 0; i < request.AcceptTypes.Length; i++) | ||
| 328 | request.AcceptTypes[i] = string.Empty; | ||
| 322 | } | 329 | } |
| 323 | 330 | ||
| 324 | // public void ConvertIHttpClientContextToOSHttp(object stateinfo) | 331 | // public void ConvertIHttpClientContextToOSHttp(object stateinfo) |