diff options
| author | Diva Canto | 2014-05-04 11:41:52 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-05-04 11:41:52 -0700 |
| commit | 7f570636f8056ec24dd7f28207af62b44a8811ba (patch) | |
| tree | dccf6626a95f3884b1a206abf416f6748a7b21f8 /OpenSim | |
| parent | Added a optional key between the group remote connectors, sim and service. Th... (diff) | |
| download | opensim-SC-7f570636f8056ec24dd7f28207af62b44a8811ba.zip opensim-SC-7f570636f8056ec24dd7f28207af62b44a8811ba.tar.gz opensim-SC-7f570636f8056ec24dd7f28207af62b44a8811ba.tar.bz2 opensim-SC-7f570636f8056ec24dd7f28207af62b44a8811ba.tar.xz | |
Please note: older simulators (0.7.6) still send the info about gzip in ContentType
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 0d7f259..06392f7 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -243,7 +243,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | Stream inputStream = request; | 245 | Stream inputStream = request; |
| 246 | if ((httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip")) | 246 | if ((httpRequest.ContentType == "application/x-gzip" || httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip")) |
| 247 | inputStream = new GZipStream(inputStream, CompressionMode.Decompress); | 247 | inputStream = new GZipStream(inputStream, CompressionMode.Decompress); |
| 248 | 248 | ||
| 249 | StreamReader reader = new StreamReader(inputStream, encoding); | 249 | StreamReader reader = new StreamReader(inputStream, encoding); |
| @@ -454,7 +454,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 454 | keysvals.Add("querystringkeys", querystringkeys); | 454 | keysvals.Add("querystringkeys", querystringkeys); |
| 455 | 455 | ||
| 456 | Stream inputStream = request; | 456 | Stream inputStream = request; |
| 457 | if ((httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip")) | 457 | if ((httpRequest.ContentType == "application/x-gzip" || httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip")) |
| 458 | inputStream = new GZipStream(inputStream, CompressionMode.Decompress); | 458 | inputStream = new GZipStream(inputStream, CompressionMode.Decompress); |
| 459 | 459 | ||
| 460 | Encoding encoding = Encoding.UTF8; | 460 | Encoding encoding = Encoding.UTF8; |