Use the "Content-Encoding" header to indicate gzipped streams

3 files changed, 7 insertions, 5 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ea7f195..2f7b549 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -833,7 +833,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             Stream inputStream = Util.Copy(request.InputStream);
 
-            if (request.ContentType == "application/x-gzip")
+            if (request.Headers["Content-Encoding"] == "gzip")
                 inputStream = new GZipStream(inputStream, System.IO.Compression.CompressionMode.Decompress);
 
             using (StreamReader reader = new StreamReader(inputStream, Encoding.UTF8))
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index 3171759..f36cbbc 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             _request = req;
             _context = context;
 
-            if (null != req.Headers["content-encoding"])
+            if ((null != req.Headers["content-encoding"]) && ("gzip" != req.Headers["content-encoding"]))
                 _contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]);
             if (null != req.Headers["content-type"])
                 _contentType = _request.Headers["content-type"];
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 10a2560..3972c06 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -250,9 +250,12 @@ namespace OpenSim.Framework
 
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
 
+                    request.ContentType = "application/json";
+                    
                     if (compressed)
                     {
-                        request.ContentType = "application/x-gzip";
+                        request.Headers["Content-Encoding"] = "gzip";
+
                         using (MemoryStream ms = new MemoryStream())
                         {
                             using (GZipStream comp = new GZipStream(ms, CompressionMode.Compress))
@@ -270,10 +273,9 @@ namespace OpenSim.Framework
                     }
                     else
                     {
-                        request.ContentType = "application/json";
                         request.ContentLength = buffer.Length;   //Count bytes to send
                         using (Stream requestStream = request.GetRequestStream())
-                                requestStream.Write(buffer, 0, buffer.Length);         //Send it
+                            requestStream.Write(buffer, 0, buffer.Length);         //Send it
                     }
                 }