aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-10-03 19:54:48 +0000
committerTeravus Ovares2008-10-03 19:54:48 +0000
commitae265e2f763412e039301d9de4ca252b3f682876 (patch)
treedbc3e910a463bdb56b5ee45d94405d8e75f32577
parent* minor: slightly simplify code in setting up the default configuration (diff)
downloadopensim-SC_OLD-ae265e2f763412e039301d9de4ca252b3f682876.zip
opensim-SC_OLD-ae265e2f763412e039301d9de4ca252b3f682876.tar.gz
opensim-SC_OLD-ae265e2f763412e039301d9de4ca252b3f682876.tar.bz2
opensim-SC_OLD-ae265e2f763412e039301d9de4ca252b3f682876.tar.xz
* Fixes a http protocol violation in HttpServer in Linux. StringWriter.Append() vs StringWriter.Append("\r\n"); StringWriter.Append() produces "\n" in *nix*
* This doesn't solve anything. Just gets the protocol right.
-rw-r--r--OpenSim/Framework/Servers/OSHttpResponse.cs7
-rw-r--r--bin/HttpServer.dllbin139264 -> 139264 bytes
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index 549ac27..24bf340 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.cs
@@ -177,7 +177,12 @@ namespace OpenSim.Framework.Servers
177 set 177 set
178 { 178 {
179 if (HttpServer) 179 if (HttpServer)
180 _httpResponse.Connection = ConnectionType.KeepAlive; 180 {
181 if (value == true)
182 _httpResponse.Connection = ConnectionType.KeepAlive;
183 else
184 _httpResponse.Connection = ConnectionType.Close;
185 }
181 else 186 else
182 _httpListenerResponse.KeepAlive = value; 187 _httpListenerResponse.KeepAlive = value;
183 } 188 }
diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll
index 39860be..f940d13 100644
--- a/bin/HttpServer.dll
+++ b/bin/HttpServer.dll
Binary files differ