From b1d8aa0b6418a4edba8ce3b7b6f3db78616fd523 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 25 Mar 2014 16:20:21 +0200
Subject: Use the "Content-Encoding" header to indicate gzipped streams

---
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Server/Handlers/Simulation/AgentHandlers.cs')

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 4ac477f..1254df4 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -232,17 +232,16 @@ namespace OpenSim.Server.Handlers.Simulation
             httpResponse.KeepAlive = false;
             Encoding encoding = Encoding.UTF8;
 
-            Stream inputStream = null;
-            if (httpRequest.ContentType == "application/x-gzip")
-                inputStream = new GZipStream(request, CompressionMode.Decompress);
-            else if (httpRequest.ContentType == "application/json")
-                inputStream = request;
-            else // no go
+            if (httpRequest.ContentType != "application/json")
             {
                 httpResponse.StatusCode = 406;
                 return encoding.GetBytes("false");
             }
 
+            Stream inputStream = request;
+            if (httpRequest.Headers["Content-Encoding"] == "gzip")
+                inputStream = new GZipStream(inputStream, CompressionMode.Decompress);
+
             StreamReader reader = new StreamReader(inputStream, encoding);
 
             string requestBody = reader.ReadToEnd();
@@ -433,11 +432,9 @@ namespace OpenSim.Server.Handlers.Simulation
             keysvals.Add("headers", headervals);
             keysvals.Add("querystringkeys", querystringkeys);
 
-            Stream inputStream;
-            if (httpRequest.ContentType == "application/x-gzip")
-                inputStream = new GZipStream(request, CompressionMode.Decompress);
-            else
-                inputStream = request;
+            Stream inputStream = request;
+            if (httpRequest.Headers["Content-Encoding"] == "gzip")
+                inputStream = new GZipStream(inputStream, CompressionMode.Decompress);
 
             Encoding encoding = Encoding.UTF8;
             StreamReader reader = new StreamReader(inputStream, encoding);
-- 
cgit v1.1