Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[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 feddae0011990acd8d0ec00b61d0799d8d56af5f..b1dc7b6101ee93cc964a5aa534459207b0b2e469 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -65,7 +65,7 @@ class HttpSocket : public InspSocket
                if (InternalState == HTTP_LISTEN)
                {
                        HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
-                       this->Instance->AddSocket(s);
+                       s = s; /* Stop GCC whining */
                }
                return true;
        }
@@ -283,10 +283,6 @@ class ModuleHttp : public Module
        void CreateListener()
        {
                http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, index);
-               if ((http) && (http->GetState() == I_LISTENING))
-               {
-                       ServerInstance->AddSocket(http);
-               }
        }
 
        ModuleHttp(InspIRCd* Me) : Module::Module(Me)
@@ -317,7 +313,7 @@ class ModuleHttp : public Module
 
        virtual ~ModuleHttp()
        {
-               ServerInstance->DelSocket(http);
+               ServerInstance->SE->DelFd(http);
        }
 
        virtual Version GetVersion()