OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This makes compression of fatpacks actually work. Previously they always failed. See comment in WebUtil.

bulletsim
Diva Canto 2011-05-11 20:44:03 -07:00
parent 9988bff9e3
commit e9e4c009b4
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Framework/WebUtil.cs
View File

@ -199,14 +199,14 @@ namespace OpenSim.Framework
using (GZipStream comp = new GZipStream(ms, CompressionMode.Compress)) using (GZipStream comp = new GZipStream(ms, CompressionMode.Compress))
{ {
comp.Write(buffer, 0, buffer.Length); comp.Write(buffer, 0, buffer.Length);
comp.Flush(); // We need to close the gzip stream before we write it anywhere
// because apparently something important related to gzip compression
ms.Seek(0, SeekOrigin.Begin); // gets written on the strteam upon Dispose()
request.ContentLength = ms.Length; //Count bytes to send
using (Stream requestStream = request.GetRequestStream())
requestStream.Write(ms.ToArray(), 0, (int)ms.Length);
} }
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 else

5
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -283,6 +283,7 @@ namespace OpenSim.Server.Handlers.Simulation
StreamReader reader = new StreamReader(inputStream, encoding); StreamReader reader = new StreamReader(inputStream, encoding);
string requestBody = reader.ReadToEnd(); string requestBody = reader.ReadToEnd();
reader.Close();
keysvals.Add("body", requestBody); keysvals.Add("body", requestBody);
httpResponse.StatusCode = 200; httpResponse.StatusCode = 200;
@ -463,15 +464,13 @@ namespace OpenSim.Server.Handlers.Simulation
if (httpRequest.ContentType == "application/x-gzip") if (httpRequest.ContentType == "application/x-gzip")
inputStream = new GZipStream(request, CompressionMode.Decompress); inputStream = new GZipStream(request, CompressionMode.Decompress);
else else
{
m_log.DebugFormat("[XXX]: Update called with {0}", httpRequest.ContentType);
inputStream = request; inputStream = request;
}
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;
StreamReader reader = new StreamReader(inputStream, encoding); StreamReader reader = new StreamReader(inputStream, encoding);
string requestBody = reader.ReadToEnd(); string requestBody = reader.ReadToEnd();
reader.Close();
keysvals.Add("body", requestBody); keysvals.Add("body", requestBody);
httpResponse.StatusCode = 200; httpResponse.StatusCode = 200;