diff options
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 97035e3..74954cc 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -454,7 +454,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
454 | } | 454 | } |
455 | 455 | ||
456 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); | 456 | OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); |
457 | 457 | resp.ReuseContext = true; | |
458 | HandleRequest(req, resp); | 458 | HandleRequest(req, resp); |
459 | 459 | ||
460 | 460 | ||
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 1ff8aca..b9e3c18 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -76,6 +76,11 @@ namespace OpenSim.Framework.Servers | |||
76 | 76 | ||
77 | protected void CreatePIDFile(string path) | 77 | protected void CreatePIDFile(string path) |
78 | { | 78 | { |
79 | if (File.Exists(path)) | ||
80 | m_log.ErrorFormat( | ||
81 | "[SERVER BASE]: Previous pid file {0} still exists on startup. Possibly previously unclean shutdown.", | ||
82 | path); | ||
83 | |||
79 | try | 84 | try |
80 | { | 85 | { |
81 | string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); | 86 | string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); |