m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

[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 88dd3f47b19b1dc861a9a848994bba54c28e244d..9a5722c6a121647d94f2f42d3da8c03dd053a954 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -26,8 +26,6 @@
 #include "iohook.h"
 #include "modules/httpd.h"
 
-/* $ModDep: modules/httpd.h */
-
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
@@ -63,7 +61,7 @@ class HttpServerSocket : public BufferedSocket
        {
                InternalState = HTTP_SERVE_WAIT_REQUEST;
 
-               FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+               FOREACH_MOD(OnHookIO, (this, via));
                if (GetIOHook())
                        GetIOHook()->OnStreamSocketAccept(this, client, server);
        }
@@ -216,7 +214,7 @@ class HttpServerSocket : public BufferedSocket
 
                        if (reqbuffer.length() >= 8192)
                        {
-                               ServerInstance->Logs->Log("m_httpd", LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer");
                                reqbuffer.clear();
                                SetError("Buffer");
                        }
@@ -360,7 +358,6 @@ class ModuleHttpServer : public Module
        {
                HttpModule = this;
                ServerInstance->Modules->AddService(APIImpl);
-               ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
        }
 
        ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE