Merge pull request #461 from SaberUK/master+header-cleanup

[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 748f530ca9642d684dce916fc916ab1b59723d1c..d768a94368e5687548ea77ce8601138c38eb9162 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -1,21 +1,32 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "httpd.h"
+#include "modules/httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
-/* $ModDep: httpd.h */
+/* $ModDep: modules/httpd.h */
 
 class ModuleHttpServer;
 
@@ -47,7 +58,6 @@ class HttpServerSocket : public BufferedSocket
        std::string http_version;
 
  public:
-
        HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
                : BufferedSocket(newfd), ip(IP), postsize(0)
        {
@@ -60,6 +70,7 @@ class HttpServerSocket : public BufferedSocket
 
        virtual void OnError(BufferedSocketError)
        {
+               ServerInstance->GlobalCulls.AddItem(this);
        }
 
        std::string Response(int response)
@@ -174,7 +185,7 @@ class HttpServerSocket : public BufferedSocket
                date[strlen(date) - 1] = '\0';
                rheaders.CreateHeader("Date", date);
 
-               rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.2");
+               rheaders.CreateHeader("Server", BRANCH);
                rheaders.SetHeader("Content-Length", ConvToStr(size));
 
                if (size)
@@ -205,7 +216,7 @@ class HttpServerSocket : public BufferedSocket
 
                        if (reqbuffer.length() >= 8192)
                        {
-                               ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+                               ServerInstance->Logs->Log("m_httpd",LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer");
                                reqbuffer.clear();
                                SetError("Buffer");
                        }
@@ -270,7 +281,7 @@ class HttpServerSocket : public BufferedSocket
                        return;
                }
 
-               if (headers.IsSet("Content-Length") && (postsize = atoi(headers.GetHeader("Content-Length").c_str())) != 0)
+               if (headers.IsSet("Content-Length") && (postsize = ConvToInt(headers.GetHeader("Content-Length"))) > 0)
                {
                        InternalState = HTTP_SERVE_RECV_POSTDATA;
 
@@ -322,10 +333,12 @@ class HttpServerSocket : public BufferedSocket
 class ModuleHttpServer : public Module
 {
        std::vector<HttpServerSocket *> httpsocks;
- public:
 
-       ModuleHttpServer()      {
+ public:
+       void init()
+       {
                HttpModule = this;
+               ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
        }
 
        void OnRequest(Request& request)
@@ -339,7 +352,7 @@ class ModuleHttpServer : public Module
 
        ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
        {
-               if (from->bind_tag->getString("type") != "httpd");
+               if (from->bind_tag->getString("type") != "httpd")
                        return MOD_RES_PASSTHRU;
                int port;
                std::string incomingip;
@@ -348,7 +361,6 @@ class ModuleHttpServer : public Module
                return MOD_RES_ALLOW;
        }
 
-
        virtual ~ModuleHttpServer()
        {
                for (size_t i = 0; i < httpsocks.size(); i++)