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

mantis 8329: don't fail if response stream is Chunked encoded and http debuglevel >=5

httptests
UbitUmarov 2018-06-18 01:04:26 +01:00
parent 31633699cf
commit 9b87626cdb
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Framework/WebUtil.cs
View File

@ -1334,16 +1334,42 @@ namespace OpenSim.Framework
public static TResponse LogAndDeserialize<TRequest, TResponse>(int reqnum, Stream respStream, long contentLength) public static TResponse LogAndDeserialize<TRequest, TResponse>(int reqnum, Stream respStream, long contentLength)
{ {
XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
if (WebUtil.DebugLevel >= 5) if (WebUtil.DebugLevel >= 5)
{ {
byte[] data = new byte[contentLength]; const int blockLength = 4096;
Util.ReadStream(respStream, data); byte[] dataBuffer = new byte[blockLength];
int curcount;
using (MemoryStream ms = new MemoryStream(4 * blockLength))
{
if(contentLength == -1)
{
while (true)
{
curcount = respStream.Read(dataBuffer, 0, blockLength);
if (curcount <= 0)
break;
ms.Write(dataBuffer, 0, curcount);
}
}
else
{
int remaining = (int)contentLength;
while (remaining > 0)
{
curcount = respStream.Read(dataBuffer, 0, remaining);
if (curcount <= 0)
throw new EndOfStreamException(String.Format("End of stream reached with {0} bytes left to read", remaining));
ms.Write(dataBuffer, 0, curcount);
remaining -= curcount;
}
}
WebUtil.LogResponseDetail(reqnum, System.Text.Encoding.UTF8.GetString(data)); dataBuffer = ms.ToArray();
WebUtil.LogResponseDetail(reqnum, System.Text.Encoding.UTF8.GetString(dataBuffer));
using (MemoryStream temp = new MemoryStream(data)) ms.Position = 0;
return (TResponse)deserializer.Deserialize(temp); return (TResponse)deserializer.Deserialize(ms);
}
} }
else else
{ {
@ -1427,6 +1453,5 @@ namespace OpenSim.Framework
} }
} }
} }
} }
} }