diff options
author | UbitUmarov | 2018-09-12 13:48:29 +0100 |
---|---|---|
committer | UbitUmarov | 2018-09-12 13:48:29 +0100 |
commit | ca404e50015141b53a7cb82e05ef7ec3d311d8cf (patch) | |
tree | 653a1ba37bc1c5d8ba6b9540eecc942eeaaee92b /OpenSim/Framework/Servers | |
parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-ca404e50015141b53a7cb82e05ef7ec3d311d8cf.zip opensim-SC-ca404e50015141b53a7cb82e05ef7ec3d311d8cf.tar.gz opensim-SC-ca404e50015141b53a7cb82e05ef7ec3d311d8cf.tar.bz2 opensim-SC-ca404e50015141b53a7cb82e05ef7ec3d311d8cf.tar.xz |
some cleanup
Diffstat (limited to 'OpenSim/Framework/Servers')
3 files changed, 1 insertions, 23 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 2819bc9..4c9b19d 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -756,7 +756,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
756 | using (MemoryStream memoryStream = new MemoryStream()) | 756 | using (MemoryStream memoryStream = new MemoryStream()) |
757 | { | 757 | { |
758 | streamHandler.Handle(path, request.InputStream, memoryStream, request, response); | 758 | streamHandler.Handle(path, request.InputStream, memoryStream, request, response); |
759 | memoryStream.Flush(); | ||
760 | buffer = memoryStream.ToArray(); | 759 | buffer = memoryStream.ToArray(); |
761 | } | 760 | } |
762 | } | 761 | } |
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index a107ced..b26321b 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | |||
@@ -301,8 +301,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
301 | /// </summary> | 301 | /// </summary> |
302 | public void Send() | 302 | public void Send() |
303 | { | 303 | { |
304 | _httpResponse.Body.Flush(); | ||
305 | |||
306 | _httpResponse.Send(); | 304 | _httpResponse.Send(); |
307 | } | 305 | } |
308 | 306 | ||
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index 4fd69f3..4ea7692 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | |||
@@ -96,7 +96,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
96 | try | 96 | try |
97 | { | 97 | { |
98 | response.OutputStream.Write(buffer, 0, buffer.Length); | 98 | response.OutputStream.Write(buffer, 0, buffer.Length); |
99 | response.OutputStream.Flush(); | ||
100 | response.Send(); | 99 | response.Send(); |
101 | buffer = null; | 100 | buffer = null; |
102 | } | 101 | } |
@@ -123,7 +122,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
123 | if(Request.Body.CanRead) | 122 | if(Request.Body.CanRead) |
124 | Request.Body.Dispose(); | 123 | Request.Body.Dispose(); |
125 | 124 | ||
126 | response.SendChunked = false; | ||
127 | response.ContentLength64 = 0; | 125 | response.ContentLength64 = 0; |
128 | response.ContentEncoding = Encoding.UTF8; | 126 | response.ContentEncoding = Encoding.UTF8; |
129 | response.KeepAlive = false; | 127 | response.KeepAlive = false; |
@@ -132,7 +130,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
132 | 130 | ||
133 | try | 131 | try |
134 | { | 132 | { |
135 | response.OutputStream.Flush(); | ||
136 | response.Send(); | 133 | response.Send(); |
137 | } | 134 | } |
138 | catch | 135 | catch |
@@ -140,20 +137,4 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
140 | } | 137 | } |
141 | } | 138 | } |
142 | } | 139 | } |
143 | 140 | } \ No newline at end of file | |
144 | class PollServiceHttpRequestComparer : IEqualityComparer<PollServiceHttpRequest> | ||
145 | { | ||
146 | public bool Equals(PollServiceHttpRequest b1, PollServiceHttpRequest b2) | ||
147 | { | ||
148 | if (b1.contextHash != b2.contextHash) | ||
149 | return false; | ||
150 | bool b = Object.ReferenceEquals(b1.HttpContext, b2.HttpContext); | ||
151 | return b; | ||
152 | } | ||
153 | |||
154 | public int GetHashCode(PollServiceHttpRequest b2) | ||
155 | { | ||
156 | return (int)b2.contextHash; | ||
157 | } | ||
158 | } | ||
159 | } | ||