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

some cleanup

0.9.1.0-post-fixes
UbitUmarov 2018-09-12 13:48:29 +01:00
parent cd9327cd8b
commit ca404e5001
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -756,7 +756,6 @@ namespace OpenSim.Framework.Servers.HttpServer
using (MemoryStream memoryStream = new MemoryStream()) using (MemoryStream memoryStream = new MemoryStream())
{ {
streamHandler.Handle(path, request.InputStream, memoryStream, request, response); streamHandler.Handle(path, request.InputStream, memoryStream, request, response);
memoryStream.Flush();
buffer = memoryStream.ToArray(); buffer = memoryStream.ToArray();
} }
} }

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

@ -301,8 +301,6 @@ namespace OpenSim.Framework.Servers.HttpServer
/// </summary> /// </summary>
public void Send() public void Send()
{ {
_httpResponse.Body.Flush();
_httpResponse.Send(); _httpResponse.Send();
} }

21
OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
View File

@ -96,7 +96,6 @@ namespace OpenSim.Framework.Servers.HttpServer
try try
{ {
response.OutputStream.Write(buffer, 0, buffer.Length); response.OutputStream.Write(buffer, 0, buffer.Length);
response.OutputStream.Flush();
response.Send(); response.Send();
buffer = null; buffer = null;
} }
@ -123,7 +122,6 @@ namespace OpenSim.Framework.Servers.HttpServer
if(Request.Body.CanRead) if(Request.Body.CanRead)
Request.Body.Dispose(); Request.Body.Dispose();
response.SendChunked = false;
response.ContentLength64 = 0; response.ContentLength64 = 0;
response.ContentEncoding = Encoding.UTF8; response.ContentEncoding = Encoding.UTF8;
response.KeepAlive = false; response.KeepAlive = false;
@ -132,7 +130,6 @@ namespace OpenSim.Framework.Servers.HttpServer
try try
{ {
response.OutputStream.Flush();
response.Send(); response.Send();
} }
catch catch
@ -140,20 +137,4 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
} }
}
class PollServiceHttpRequestComparer : IEqualityComparer<PollServiceHttpRequest>
{
public bool Equals(PollServiceHttpRequest b1, PollServiceHttpRequest b2)
{
if (b1.contextHash != b2.contextHash)
return false;
bool b = Object.ReferenceEquals(b1.HttpContext, b2.HttpContext);
return b;
}
public int GetHashCode(PollServiceHttpRequest b2)
{
return (int)b2.contextHash;
}
}
}