diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-27 19:36:52 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-27 19:36:52 -0400 |
commit | 65dda8a795b658a39c2f617124a31c928030fb4b (patch) | |
tree | a95c5e5d82fecd321c76abb6dd26737a3fff4629 /OpenSim/Framework/Servers | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
parent | Remove OpenSim.ini comments from the top of FlotsamAssetCache.cs to avoid dup... (diff) | |
download | opensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.zip opensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.tar.gz opensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.tar.bz2 opensim-SC_OLD-65dda8a795b658a39c2f617124a31c928030fb4b.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 75c9310..771ae05 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1637,13 +1637,20 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1637 | public void Stop() | 1637 | public void Stop() |
1638 | { | 1638 | { |
1639 | HTTPDRunning = false; | 1639 | HTTPDRunning = false; |
1640 | m_httpListener2.ExceptionThrown -= httpServerException; | 1640 | try |
1641 | //m_httpListener2.DisconnectHandler = null; | 1641 | { |
1642 | 1642 | m_httpListener2.ExceptionThrown -= httpServerException; | |
1643 | m_httpListener2.LogWriter = null; | 1643 | //m_httpListener2.DisconnectHandler = null; |
1644 | m_httpListener2.RequestReceived -= OnRequest; | ||
1645 | 1644 | ||
1646 | m_httpListener2.Stop(); | 1645 | m_httpListener2.LogWriter = null; |
1646 | m_httpListener2.RequestReceived -= OnRequest; | ||
1647 | m_httpListener2.Stop(); | ||
1648 | } | ||
1649 | catch (NullReferenceException) | ||
1650 | { | ||
1651 | m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer."); | ||
1652 | } | ||
1653 | |||
1647 | } | 1654 | } |
1648 | 1655 | ||
1649 | public void RemoveStreamHandler(string httpMethod, string path) | 1656 | public void RemoveStreamHandler(string httpMethod, string path) |