From e9e4c009b470056dce05cae386860494b0734678 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 11 May 2011 20:44:03 -0700
Subject: This makes compression of fatpacks actually work. Previously they
 always failed. See comment in WebUtil.

---
 OpenSim/Framework/WebUtil.cs                        | 14 +++++++-------
 OpenSim/Server/Handlers/Simulation/AgentHandlers.cs |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 55b38cd..bc2cd01 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -199,14 +199,14 @@ namespace OpenSim.Framework
                             using (GZipStream comp = new GZipStream(ms, CompressionMode.Compress))
                             {
                                 comp.Write(buffer, 0, buffer.Length);
-                                comp.Flush();
-
-                                ms.Seek(0, SeekOrigin.Begin);
-
-                                request.ContentLength = ms.Length;   //Count bytes to send
-                                using (Stream requestStream = request.GetRequestStream())
-                                        requestStream.Write(ms.ToArray(), 0, (int)ms.Length);
+                                // We need to close the gzip stream before we write it anywhere
+                                // because apparently something important related to gzip compression
+                                // gets written on the strteam upon Dispose()
                             }
+                            byte[] buf = ms.ToArray();
+                            request.ContentLength = buf.Length;   //Count bytes to send
+                            using (Stream requestStream = request.GetRequestStream())
+                                requestStream.Write(buf, 0, (int)buf.Length);
                         }
                     }
                     else
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index ad74b9b..e8ae05b 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -283,6 +283,7 @@ namespace OpenSim.Server.Handlers.Simulation
             StreamReader reader = new StreamReader(inputStream, encoding);
 
             string requestBody = reader.ReadToEnd();
+            reader.Close();
             keysvals.Add("body", requestBody);
 
             httpResponse.StatusCode = 200;
@@ -463,15 +464,13 @@ namespace OpenSim.Server.Handlers.Simulation
             if (httpRequest.ContentType == "application/x-gzip")
                 inputStream = new GZipStream(request, CompressionMode.Decompress);
             else
-            {
-                m_log.DebugFormat("[XXX]: Update called with {0}", httpRequest.ContentType);
                 inputStream = request;
-            }
 
             Encoding encoding = Encoding.UTF8;
             StreamReader reader = new StreamReader(inputStream, encoding);
 
             string requestBody = reader.ReadToEnd();
+            reader.Close();
             keysvals.Add("body", requestBody);
 
             httpResponse.StatusCode = 200;
-- 
cgit v1.1