aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-08 22:19:37 +0100
committerJustin Clark-Casey (justincc)2013-07-08 22:19:37 +0100
commitdc545817002246abe2bca9d17a9e7f3c21a3468b (patch)
tree50dfa83ed7de610aecc1b9a01cbcb5afa66debdf
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentBaseHttpServer: if the handler sets the content length, don't override it. Th... (diff)
downloadopensim-SC_OLD-dc545817002246abe2bca9d17a9e7f3c21a3468b.zip
opensim-SC_OLD-dc545817002246abe2bca9d17a9e7f3c21a3468b.tar.gz
opensim-SC_OLD-dc545817002246abe2bca9d17a9e7f3c21a3468b.tar.bz2
opensim-SC_OLD-dc545817002246abe2bca9d17a9e7f3c21a3468b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-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);