diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs index 5122a77..a77e67d 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
64 | { | 64 | { |
65 | asset = (AssetBase)xs.Deserialize(request); | 65 | asset = (AssetBase)xs.Deserialize(request); |
66 | } | 66 | } |
67 | catch (XmlException) | 67 | catch (Exception) |
68 | { | 68 | { |
69 | httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; | 69 | httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; |
70 | return null; | 70 | return null; |
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; |