ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster

Browse Source
This commit is contained in:
Melanie
2013-03-19 00:54:23 +00:00
parent b9146a7922 464201b41d
commit 5b950ca36a
29 changed files with 157 additions and 8909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -487,7 +487,9 @@ namespace OpenSim.Framework.Servers.HttpServer
{
try
{
SendHTML500(response);
byte[] buffer500 = SendHTML500(response);
response.Body.Write(buffer500,0,buffer500.Length);
response.Body.Close();
}
catch
{
@@ -720,7 +722,15 @@ namespace OpenSim.Framework.Servers.HttpServer
catch (Exception e)
{
m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.StackTrace), e);
SendHTML500(response);
try
{
byte[] buffer500 = SendHTML500(response);
response.Body.Write(buffer500, 0, buffer500.Length);
response.Body.Close();
}
catch
{
}
}
finally
{
@@ -1792,7 +1802,8 @@ namespace OpenSim.Framework.Servers.HttpServer
response.SendChunked = false;
response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8;
return buffer;
}