X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=64bef70d11ad3959a4323f0a1efedf5de2ab07d9;hb=a86e320ac19fbbd6034d0447f048beb8b4a0ad1d;hp=e09ca3fa2c03c604f644736e7c839065ff08be00;hpb=7918febc630d7d6f94fda1a918fe7b98c2d0e742;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index e09ca3fa2..64bef70d1 100644
--- 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)