aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-08 14:12:11 -0700
committerDiva Canto2013-07-08 14:12:11 -0700
commitb2d4b8b1da10e88d0f2471fb9cd502a8ed7dd095 (patch)
tree1fede6c27cc16aef259e4e61e1219e1c00ef647e
parentPlaced a throttle on UserManagementModule for name lookups. Singularity appar... (diff)
downloadopensim-SC_OLD-b2d4b8b1da10e88d0f2471fb9cd502a8ed7dd095.zip
opensim-SC_OLD-b2d4b8b1da10e88d0f2471fb9cd502a8ed7dd095.tar.gz
opensim-SC_OLD-b2d4b8b1da10e88d0f2471fb9cd502a8ed7dd095.tar.bz2
opensim-SC_OLD-b2d4b8b1da10e88d0f2471fb9cd502a8ed7dd095.tar.xz
BaseHttpServer: if the handler sets the content length, don't override it. This happens in HEAD handlers.
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 40b8c5c..6863e0e 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -688,7 +688,7 @@ namespace OpenSim.Framework.Servers.HttpServer
688 688
689 if (buffer != null) 689 if (buffer != null)
690 { 690 {
691 if (!response.SendChunked) 691 if (!response.SendChunked && response.ContentLength64 <= 0)
692 response.ContentLength64 = buffer.LongLength; 692 response.ContentLength64 = buffer.LongLength;
693 693
694 response.OutputStream.Write(buffer, 0, buffer.Length); 694 response.OutputStream.Write(buffer, 0, buffer.Length);