X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=e09ca3fa2c03c604f644736e7c839065ff08be00;hb=30b78bc2f4f7b74574abfbb3a3c2dc04686d2e7d;hp=3558b0a2b365680b06c8e12aa188f50d24922fc2;hpb=1e8e379dce7a3311eff7161269593f1655f577eb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 3558b0a2b..e09ca3fa2 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -29,7 +29,6 @@
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
-static bool claimed;
 static insp::intrusive_list<HttpServerSocket> sockets;
 static Events::ModuleEventProvider* aclevprov;
 static Events::ModuleEventProvider* reqevprov;
@@ -324,13 +323,12 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 	{
 		InternalState = HTTP_SERVE_SEND_DATA;
 
-		claimed = false;
 		ModResult MOD_RESULT;
-		HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata);
+		HTTPRequest acl(request_type, uri, &headers, this, ip, postdata);
 		FIRST_MOD_RESULT_CUSTOM(*aclevprov, HTTPACLEventListener, OnHTTPACLCheck, MOD_RESULT, (acl));
 		if (MOD_RESULT != MOD_RES_DENY)
 		{
-			HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata);
+			HTTPRequest url(request_type, uri, &headers, this, ip, postdata);
 			FIRST_MOD_RESULT_CUSTOM(*reqevprov, HTTPRequestEventListener, OnHTTPRequest, MOD_RESULT, (url));
 			if (MOD_RESULT == MOD_RES_PASSTHRU)
 			{
@@ -366,7 +364,6 @@ class HTTPdAPIImpl : public HTTPdAPIBase
 
 	void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
 	{
-		claimed = true;
 		resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
 	}
 };