Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

2026-08-06 09:16:28 +08:00 · 2013-10-06 18:33:49 +01:00
parent 69054ad134 ece2d24077
commit 9800c6fa6c
6 changed files with 34 additions and 6 deletions
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1967,6 +1967,7 @@ namespace OpenSim.Framework.Servers.HttpServer

        public void RemoveHTTPHandler(string httpMethod, string path)
        {
+            if (path == null) return; // Caps module isn't loaded, tries to remove handler where path = null
            lock (m_HTTPHandlers)
            {
                if (httpMethod != null && httpMethod.Length == 0)