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

* Fixed another potential httpserver leak.

Browse Source
This commit is contained in:
Teravus Ovares
2009-07-30 18:16:00 +00:00
parent 22a533b675
commit 23a8895d29
6 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1321,6 +1321,7 @@ namespace OpenSim.Framework.Servers.HttpServer
string responseString = (string)responsedata["str_response_string"];
string contentType = (string)responsedata["content_type"];
if (responsedata.ContainsKey("error_status_text"))
{
response.StatusDescription = (string)responsedata["error_status_text"];
@@ -1336,6 +1337,10 @@ namespace OpenSim.Framework.Servers.HttpServer
response.KeepAlive = keepalive;
}
if (responsedata.ContainsKey("reusecontext"))
response.ReuseContext = (bool) responsedata["reusecontext"];
//Even though only one other part of the entire code uses HTTPHandlers, we shouldn't expect this
//and should check for NullReferenceExceptions
@@ -1391,7 +1396,7 @@ namespace OpenSim.Framework.Servers.HttpServer
response.OutputStream.Flush();
response.Send();
if (!response.KeepAlive)
if (!response.KeepAlive && response.ReuseContext)
response.FreeContext();
}
catch (SocketException e)

19
OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
View File

@@ -256,6 +256,25 @@ namespace OpenSim.Framework.Servers.HttpServer
}
}
public bool ReuseContext
{
get
{
if (_httpClientContext != null)
{
return !_httpClientContext.EndWhenDone;
}
return true;
}
set
{
if (_httpClientContext != null)
{
_httpClientContext.EndWhenDone = !value;
}
}
}
protected IHttpResponse _httpResponse;
private IHttpClientContext _httpClientContext;