aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation
diff options
context:
space:
mode:
authorOren Hurvitz2014-03-25 19:09:03 +0200
committerOren Hurvitz2014-03-25 18:09:23 +0100
commit6d1d58b6549daea0183b70a1c702e3017abb9663 (patch)
tree3bd5ce0ff0f501dcccccc24915b7e00207563d47 /OpenSim/Server/Handlers/Simulation
parentUse the "Content-Encoding" header to indicate gzipped streams (diff)
downloadopensim-SC_OLD-6d1d58b6549daea0183b70a1c702e3017abb9663.zip
opensim-SC_OLD-6d1d58b6549daea0183b70a1c702e3017abb9663.tar.gz
opensim-SC_OLD-6d1d58b6549daea0183b70a1c702e3017abb9663.tar.bz2
opensim-SC_OLD-6d1d58b6549daea0183b70a1c702e3017abb9663.tar.xz
Use the "X-Content-Encoding" header to indicate gzipped data, because old OpenSims fail if they get an unknown "Content-Encoding"
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 1254df4..9c7f17e 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Server.Handlers.Simulation
239 } 239 }
240 240
241 Stream inputStream = request; 241 Stream inputStream = request;
242 if (httpRequest.Headers["Content-Encoding"] == "gzip") 242 if ((httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip"))
243 inputStream = new GZipStream(inputStream, CompressionMode.Decompress); 243 inputStream = new GZipStream(inputStream, CompressionMode.Decompress);
244 244
245 StreamReader reader = new StreamReader(inputStream, encoding); 245 StreamReader reader = new StreamReader(inputStream, encoding);
@@ -433,7 +433,7 @@ namespace OpenSim.Server.Handlers.Simulation
433 keysvals.Add("querystringkeys", querystringkeys); 433 keysvals.Add("querystringkeys", querystringkeys);
434 434
435 Stream inputStream = request; 435 Stream inputStream = request;
436 if (httpRequest.Headers["Content-Encoding"] == "gzip") 436 if ((httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip"))
437 inputStream = new GZipStream(inputStream, CompressionMode.Decompress); 437 inputStream = new GZipStream(inputStream, CompressionMode.Decompress);
438 438
439 Encoding encoding = Encoding.UTF8; 439 Encoding encoding = Encoding.UTF8;