ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Oren Hurvitz
2014-03-25 16:20:21 +02:00
parent 8ecab21b37
commit b1d8aa0b64
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -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))

2
OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
View File

@@ -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"];

8
OpenSim/Framework/WebUtil.cs
View File

@@ -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
}
}