Keep multiple IOHookProvider references in class ListenSocket

[user/henk/code/inspircd.git] / src / modules / m_httpd.cpp

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index e09ca3fa2c03c604f644736e7c839065ff08be00..64bef70d11ad3959a4323f0a1efedf5de2ab07d9 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -78,8 +78,8 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
        {
                ServerInstance->Timers.AddTimer(this);
 
-               if (via->iohookprov)
-                       via->iohookprov->OnAccept(this, client, server);
+               if ((!via->iohookprovs.empty()) && (via->iohookprovs.back()))
+                       via->iohookprovs.back()->OnAccept(this, client, server);
        }
 
        ~HttpServerSocket()
@@ -407,6 +407,20 @@ class ModuleHttpServer : public Module
                return MOD_RES_ALLOW;
        }
 
+       void OnUnloadModule(Module* mod)
+       {
+               for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); )
+               {
+                       HttpServerSocket* sock = *i;
+                       ++i;
+                       if (sock->GetModHook(mod))
+                       {
+                               sock->cull();
+                               delete sock;
+                       }
+               }
+       }
+
        CullResult cull() CXX11_OVERRIDE
        {
                for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)