aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712007-09-24 11:20:09 +0000
committerlbsa712007-09-24 11:20:09 +0000
commitf076c7193638e24936269296cecac251628bc6c0 (patch)
treecaa70f7d823b40581f203ec32eb8e84d92c73fdd /OpenSim
parent* Console output killed the cat. s/cat/sim/ (diff)
downloadopensim-SC_OLD-f076c7193638e24936269296cecac251628bc6c0.zip
opensim-SC_OLD-f076c7193638e24936269296cecac251628bc6c0.tar.gz
opensim-SC_OLD-f076c7193638e24936269296cecac251628bc6c0.tar.bz2
opensim-SC_OLD-f076c7193638e24936269296cecac251628bc6c0.tar.xz
* Applied tleiades patch #435 fixing HttpBaseServer ABEND (thanx!)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 0bd7495..6d432fd 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -197,9 +197,18 @@ namespace OpenSim.Framework.Servers
197 response.SendChunked = false; 197 response.SendChunked = false;
198 response.ContentLength64 = buffer.Length; 198 response.ContentLength64 = buffer.Length;
199 response.ContentEncoding = Encoding.UTF8; 199 response.ContentEncoding = Encoding.UTF8;
200 200 try
201 response.OutputStream.Write(buffer, 0, buffer.Length); 201 {
202 response.OutputStream.Close(); 202 response.OutputStream.Write(buffer, 0, buffer.Length);
203 }
204 catch (Exception ex)
205 {
206 MainLog.Instance.Warn("HTTPD", "Error - " + ex.Message);
207 }
208 finally
209 {
210 response.OutputStream.Close();
211 }
203 } 212 }
204 213
205 public void Start() 214 public void Start()