X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=35ae9abe5cecd8b7ba010e86a5e53e9e27919917;hb=97b5e92c3d1195c4e3b3dc8dea3183c06399414e;hp=760647d47f1ae796636e8de03bedf1045cf3ae6c;hpb=b22d8ea93321c3be05f3d28936d27cfbe56c86b3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 760647d47..35ae9abe5 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -76,10 +76,18 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 		, postsize(0)
 		, waitingcull(false)
 	{
-		ServerInstance->Timers.AddTimer(this);
+		if ((!via->iohookprovs.empty()) && (via->iohookprovs.back()))
+		{
+			via->iohookprovs.back()->OnAccept(this, client, server);
+			// IOHook may have errored
+			if (!getError().empty())
+			{
+				AddToCull();
+				return;
+			}
+		}
 
-		if (via->iohookprov)
-			via->iohookprov->OnAccept(this, client, server);
+		ServerInstance->Timers.AddTimer(this);
 	}
 
 	~HttpServerSocket()
@@ -216,7 +224,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 		WriteData("\r\n");
 	}
 
-	void OnDataReady()
+	void OnDataReady() CXX11_OVERRIDE
 	{
 		if (InternalState == HTTP_SERVE_RECV_POSTDATA)
 		{
@@ -407,13 +415,13 @@ class ModuleHttpServer : public Module
 		return MOD_RES_ALLOW;
 	}
 
-	void OnUnloadModule(Module* mod)
+	void OnUnloadModule(Module* mod) CXX11_OVERRIDE
 	{
 		for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); )
 		{
 			HttpServerSocket* sock = *i;
 			++i;
-			if (sock->GetIOHook() && sock->GetIOHook()->prov->creator == mod)
+			if (sock->GetModHook(mod))
 			{
 				sock->cull();
 				delete sock;