Remove $Core and $Mod* comments apart from $ModDep.

[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 cbee27958b5aeb4fe85fe2e246ed6a444b26cb78..88dd3f47b19b1dc861a9a848994bba54c28e244d 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -23,9 +23,9 @@
 
 
 #include "inspircd.h"
+#include "iohook.h"
 #include "modules/httpd.h"
 
-/* $ModDesc: Provides HTTP serving facilities to modules */
 /* $ModDep: modules/httpd.h */
 
 class ModuleHttpServer;
@@ -330,24 +330,37 @@ class HttpServerSocket : public BufferedSocket
        }
 };
 
+class HTTPdAPIImpl : public HTTPdAPIBase
+{
+ public:
+       HTTPdAPIImpl(Module* parent)
+               : HTTPdAPIBase(parent)
+       {
+       }
+
+       void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
+       {
+               claimed = true;
+               resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
+       }
+};
+
 class ModuleHttpServer : public Module
 {
        std::vector<HttpServerSocket *> httpsocks;
+       HTTPdAPIImpl APIImpl;
 
  public:
-       void init() CXX11_OVERRIDE
+       ModuleHttpServer()
+               : APIImpl(this)
        {
-               HttpModule = this;
-               ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
        }
 
-       void OnRequest(Request& request) CXX11_OVERRIDE
+       void init() CXX11_OVERRIDE
        {
-               if (strcmp(request.id, "HTTP-DOC") != 0)
-                       return;
-               HTTPDocumentResponse& resp = static_cast<HTTPDocumentResponse&>(request);
-               claimed = true;
-               resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
+               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