X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=efed34799bb9ee1d1ee892da7a830fcbc7ffde12;hb=08572a9376e6f41109e233cb45d7e491ad1ebf07;hp=47416406ec4301270856e8906a5dc4e70fdd88f5;hpb=3b83968416bcc5710c394892bb2ac1cc79f0298a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 47416406e..efed34799 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -1,12 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2018 edef <edef@edef.eu>
+ *   Copyright (C) 2013-2014, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   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) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -21,317 +26,305 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/// $CompilerFlags: -Ivendor_directory("http_parser")
+
 
 #include "inspircd.h"
 #include "iohook.h"
 #include "modules/httpd.h"
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
+
+// Fix warnings about the use of commas at end of enumerator lists and long long
+// on C++03.
+#if defined __clang__
+# pragma clang diagnostic ignored "-Wc++11-extensions"
+# pragma clang diagnostic ignored "-Wc++11-long-long"
+#elif defined __GNUC__
+# pragma GCC diagnostic ignored "-Wlong-long"
+# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))
+#  pragma GCC diagnostic ignored "-Wpedantic"
+# else
+#  pragma GCC diagnostic ignored "-pedantic"
+# endif
+#endif
+
+// Fix warnings about shadowing in http_parser.
+#ifdef __GNUC__
+# pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+#include <http_parser.c>
+
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
-static bool claimed;
 static insp::intrusive_list<HttpServerSocket> sockets;
 static Events::ModuleEventProvider* aclevprov;
 static Events::ModuleEventProvider* reqevprov;
-
-/** HTTP socket states
- */
-enum HttpState
-{
-	HTTP_SERVE_WAIT_REQUEST = 0, /* Waiting for a full request */
-	HTTP_SERVE_RECV_POSTDATA = 1, /* Waiting to finish recieving POST data */
-	HTTP_SERVE_SEND_DATA = 2 /* Sending response */
-};
+static http_parser_settings parser_settings;
 
 /** A socket used for HTTP transport
  */
 class HttpServerSocket : public BufferedSocket, public Timer, public insp::intrusive_list_node<HttpServerSocket>
 {
-	HttpState InternalState;
-	std::string ip;
+ private:
+	friend class ModuleHttpServer;
 
-	HTTPHeaders headers;
-	std::string reqbuffer;
-	std::string postdata;
-	unsigned int postsize;
-	std::string request_type;
+	http_parser parser;
+	http_parser_url url;
+	std::string ip;
 	std::string uri;
-	std::string http_version;
+	HTTPHeaders headers;
+	std::string body;
+	size_t total_buffers;
+	int status_code;
 
 	/** True if this object is in the cull list
 	 */
 	bool waitingcull;
+	bool messagecomplete;
 
 	bool Tick(time_t currtime) CXX11_OVERRIDE
 	{
-		AddToCull();
-		return false;
+		if (!messagecomplete)
+		{
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "HTTP socket %d timed out", GetFd());
+			Close();
+			return false;
+		}
+
+		return true;
 	}
 
- public:
-	HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server, unsigned int timeoutsec)
-		: BufferedSocket(newfd)
-		, Timer(timeoutsec)
-		, InternalState(HTTP_SERVE_WAIT_REQUEST)
-		, ip(IP)
-		, postsize(0)
-		, waitingcull(false)
+	template<int (HttpServerSocket::*f)()>
+	static int Callback(http_parser* p)
 	{
-		ServerInstance->Timers.AddTimer(this);
-
-		if (via->iohookprov)
-			via->iohookprov->OnAccept(this, client, server);
+		HttpServerSocket* sock = static_cast<HttpServerSocket*>(p->data);
+		return (sock->*f)();
 	}
 
-	~HttpServerSocket()
+	template<int (HttpServerSocket::*f)(const char*, size_t)>
+	static int DataCallback(http_parser* p, const char* buf, size_t len)
 	{
-		sockets.erase(this);
+		HttpServerSocket* sock = static_cast<HttpServerSocket*>(p->data);
+		return (sock->*f)(buf, len);
 	}
 
-	void OnError(BufferedSocketError) CXX11_OVERRIDE
+	static void ConfigureParser()
 	{
-		AddToCull();
+		http_parser_settings_init(&parser_settings);
+		parser_settings.on_message_begin = Callback<&HttpServerSocket::OnMessageBegin>;
+		parser_settings.on_url = DataCallback<&HttpServerSocket::OnUrl>;
+		parser_settings.on_header_field = DataCallback<&HttpServerSocket::OnHeaderField>;
+		parser_settings.on_body = DataCallback<&HttpServerSocket::OnBody>;
+		parser_settings.on_message_complete = Callback<&HttpServerSocket::OnMessageComplete>;
 	}
 
-	std::string Response(int response)
+	int OnMessageBegin()
 	{
-		switch (response)
-		{
-			case 100:
-				return "CONTINUE";
-			case 101:
-				return "SWITCHING PROTOCOLS";
-			case 200:
-				return "OK";
-			case 201:
-				return "CREATED";
-			case 202:
-				return "ACCEPTED";
-			case 203:
-				return "NON-AUTHORITATIVE INFORMATION";
-			case 204:
-				return "NO CONTENT";
-			case 205:
-				return "RESET CONTENT";
-			case 206:
-				return "PARTIAL CONTENT";
-			case 300:
-				return "MULTIPLE CHOICES";
-			case 301:
-				return "MOVED PERMANENTLY";
-			case 302:
-				return "FOUND";
-			case 303:
-				return "SEE OTHER";
-			case 304:
-				return "NOT MODIFIED";
-			case 305:
-				return "USE PROXY";
-			case 307:
-				return "TEMPORARY REDIRECT";
-			case 400:
-				return "BAD REQUEST";
-			case 401:
-				return "UNAUTHORIZED";
-			case 402:
-				return "PAYMENT REQUIRED";
-			case 403:
-				return "FORBIDDEN";
-			case 404:
-				return "NOT FOUND";
-			case 405:
-				return "METHOD NOT ALLOWED";
-			case 406:
-				return "NOT ACCEPTABLE";
-			case 407:
-				return "PROXY AUTHENTICATION REQUIRED";
-			case 408:
-				return "REQUEST TIMEOUT";
-			case 409:
-				return "CONFLICT";
-			case 410:
-				return "GONE";
-			case 411:
-				return "LENGTH REQUIRED";
-			case 412:
-				return "PRECONDITION FAILED";
-			case 413:
-				return "REQUEST ENTITY TOO LARGE";
-			case 414:
-				return "REQUEST-URI TOO LONG";
-			case 415:
-				return "UNSUPPORTED MEDIA TYPE";
-			case 416:
-				return "REQUESTED RANGE NOT SATISFIABLE";
-			case 417:
-				return "EXPECTATION FAILED";
-			case 500:
-				return "INTERNAL SERVER ERROR";
-			case 501:
-				return "NOT IMPLEMENTED";
-			case 502:
-				return "BAD GATEWAY";
-			case 503:
-				return "SERVICE UNAVAILABLE";
-			case 504:
-				return "GATEWAY TIMEOUT";
-			case 505:
-				return "HTTP VERSION NOT SUPPORTED";
-			default:
-				return "WTF";
-			break;
-
-		}
+		uri.clear();
+		header_state = HEADER_NONE;
+		body.clear();
+		total_buffers = 0;
+		return 0;
 	}
 
-	void SendHTTPError(int response)
+	bool AcceptData(size_t len)
 	{
-		HTTPHeaders empty;
-		std::string data = "<html><head></head><body>Server error "+ConvToStr(response)+": "+Response(response)+"<br>"+
-		                   "<small>Powered by <a href='http://www.inspircd.org'>InspIRCd</a></small></body></html>";
-
-		SendHeaders(data.length(), response, empty);
-		WriteData(data);
+		total_buffers += len;
+		return total_buffers < 8192;
 	}
 
-	void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
+	int OnUrl(const char* buf, size_t len)
 	{
+		if (!AcceptData(len))
+		{
+			status_code = HTTP_STATUS_URI_TOO_LONG;
+			return -1;
+		}
+		uri.append(buf, len);
+		return 0;
+	}
 
-		WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
-
-		rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true));
-		rheaders.CreateHeader("Server", INSPIRCD_BRANCH);
-		rheaders.SetHeader("Content-Length", ConvToStr(size));
-
-		if (size)
-			rheaders.CreateHeader("Content-Type", "text/html");
-		else
-			rheaders.RemoveHeader("Content-Type");
-
-		/* Supporting Connection: keep-alive causes a whole world of hurt syncronizing timeouts,
-		 * so remove it, its not essential for what we need.
-		 */
-		rheaders.SetHeader("Connection", "Close");
+	enum { HEADER_NONE, HEADER_FIELD, HEADER_VALUE } header_state;
+	std::string header_field;
+	std::string header_value;
 
-		WriteData(rheaders.GetFormattedHeaders());
-		WriteData("\r\n");
+	void OnHeaderComplete()
+	{
+		headers.SetHeader(header_field, header_value);
+		header_field.clear();
+		header_value.clear();
 	}
 
-	void OnDataReady()
+	int OnHeaderField(const char* buf, size_t len)
 	{
-		if (InternalState == HTTP_SERVE_RECV_POSTDATA)
+		if (header_state == HEADER_VALUE)
+			OnHeaderComplete();
+		header_state = HEADER_FIELD;
+		if (!AcceptData(len))
 		{
-			postdata.append(recvq);
-			if (postdata.length() >= postsize)
-				ServeData();
+			status_code = HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE;
+			return -1;
 		}
-		else
+		header_field.append(buf, len);
+		return 0;
+	}
+
+	int OnHeaderValue(const char* buf, size_t len)
+	{
+		header_state = HEADER_VALUE;
+		if (!AcceptData(len))
 		{
-			reqbuffer.append(recvq);
+			status_code = HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE;
+			return -1;
+		}
+		header_value.append(buf, len);
+		return 0;
+	}
 
-			if (reqbuffer.length() >= 8192)
-			{
-				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer");
-				reqbuffer.clear();
-				SetError("Buffer");
-			}
+	int OnHeadersComplete()
+	{
+		if (header_state != HEADER_NONE)
+			OnHeaderComplete();
+		return 0;
+	}
 
-			if (InternalState == HTTP_SERVE_WAIT_REQUEST)
-				CheckRequestBuffer();
+	int OnBody(const char* buf, size_t len)
+	{
+		if (!AcceptData(len))
+		{
+			status_code = HTTP_STATUS_PAYLOAD_TOO_LARGE;
+			return -1;
 		}
+		body.append(buf, len);
+		return 0;
 	}
 
-	void CheckRequestBuffer()
+	int OnMessageComplete()
 	{
-		std::string::size_type reqend = reqbuffer.find("\r\n\r\n");
-		if (reqend == std::string::npos)
-			return;
+		messagecomplete = true;
+		ServeData();
+		return 0;
+	}
 
-		// We have the headers; parse them all
-		std::string::size_type hbegin = 0, hend;
-		while ((hend = reqbuffer.find("\r\n", hbegin)) != std::string::npos)
+ public:
+	HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server, unsigned int timeoutsec)
+		: BufferedSocket(newfd)
+		, Timer(timeoutsec)
+		, ip(IP)
+		, status_code(0)
+		, waitingcull(false)
+		, messagecomplete(false)
+	{
+		if ((!via->iohookprovs.empty()) && (via->iohookprovs.back()))
 		{
-			if (hbegin == hend)
-				break;
-
-			if (request_type.empty())
+			via->iohookprovs.back()->OnAccept(this, client, server);
+			// IOHook may have errored
+			if (!getError().empty())
 			{
-				std::istringstream cheader(std::string(reqbuffer, hbegin, hend - hbegin));
-				cheader >> request_type;
-				cheader >> uri;
-				cheader >> http_version;
-
-				if (request_type.empty() || uri.empty() || http_version.empty())
-				{
-					SendHTTPError(400);
-					return;
-				}
-
-				hbegin = hend + 2;
-				continue;
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "HTTP socket %d encountered a hook error: %s",
+					GetFd(), getError().c_str());
+				Close();
+				return;
 			}
+		}
+
+		parser.data = this;
+		http_parser_init(&parser, HTTP_REQUEST);
+		ServerInstance->Timers.AddTimer(this);
+	}
 
-			std::string cheader(reqbuffer, hbegin, hend - hbegin);
+	~HttpServerSocket()
+	{
+		sockets.erase(this);
+	}
 
-			std::string::size_type fieldsep = cheader.find(':');
-			if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
-			{
-				SendHTTPError(400);
-				return;
-			}
+	void Close() CXX11_OVERRIDE
+	{
+		if (waitingcull || !HasFd())
+			return;
 
-			headers.SetHeader(cheader.substr(0, fieldsep), cheader.substr(fieldsep + 2));
+		waitingcull = true;
+		BufferedSocket::Close();
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
 
-			hbegin = hend + 2;
-		}
+	void OnError(BufferedSocketError err) CXX11_OVERRIDE
+	{
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "HTTP socket %d encountered an error: %d - %s",
+			GetFd(), err, getError().c_str());
+		Close();
+	}
 
-		reqbuffer.erase(0, reqend + 4);
+	void SendHTTPError(unsigned int response, const char* errstr = NULL)
+	{
+		if (!errstr)
+			errstr = http_status_str((http_status)response);
+
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Sending HTTP error %u: %s", response, errstr);
+		static HTTPHeaders empty;
+		std::string data = InspIRCd::Format(
+			"<html><head></head><body style='font-family: sans-serif; text-align: center'>"
+			"<h1 style='font-size: 48pt'>Error %u</h1><h2 style='font-size: 24pt'>%s</h2><hr>"
+			"<small>Powered by <a href='https://www.inspircd.org'>InspIRCd</a></small></body></html>",
+			response, errstr);
+
+		Page(data, response, &empty);
+	}
 
-		std::transform(request_type.begin(), request_type.end(), request_type.begin(), ::toupper);
-		std::transform(http_version.begin(), http_version.end(), http_version.begin(), ::toupper);
+	void SendHeaders(unsigned long size, unsigned int response, HTTPHeaders &rheaders)
+	{
+		WriteData(InspIRCd::Format("HTTP/%u.%u %u %s\r\n", parser.http_major ? parser.http_major : 1, parser.http_major ? parser.http_minor : 1, response, http_status_str((http_status)response)));
 
-		if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
-		{
-			SendHTTPError(505);
-			return;
-		}
+		rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true));
+		rheaders.CreateHeader("Server", INSPIRCD_BRANCH);
+		rheaders.SetHeader("Content-Length", ConvToStr(size));
 
-		if (headers.IsSet("Content-Length") && (postsize = ConvToInt(headers.GetHeader("Content-Length"))) > 0)
-		{
-			InternalState = HTTP_SERVE_RECV_POSTDATA;
+		if (size)
+			rheaders.CreateHeader("Content-Type", "text/html");
+		else
+			rheaders.RemoveHeader("Content-Type");
 
-			if (reqbuffer.length() >= postsize)
-			{
-				postdata.assign(reqbuffer, 0, postsize);
-				reqbuffer.erase(0, postsize);
-			}
-			else if (!reqbuffer.empty())
-			{
-				postdata = reqbuffer;
-				reqbuffer.clear();
-			}
+		/* Supporting Connection: keep-alive causes a whole world of hurt synchronizing timeouts,
+		 * so remove it, its not essential for what we need.
+		 */
+		rheaders.SetHeader("Connection", "Close");
 
-			if (postdata.length() >= postsize)
-				ServeData();
+		WriteData(rheaders.GetFormattedHeaders());
+		WriteData("\r\n");
+	}
 
+	void OnDataReady() CXX11_OVERRIDE
+	{
+		if (parser.upgrade || HTTP_PARSER_ERRNO(&parser))
 			return;
-		}
-
-		ServeData();
+		http_parser_execute(&parser, &parser_settings, recvq.data(), recvq.size());
+		if (parser.upgrade)
+			SendHTTPError(status_code ? status_code : 400);
+		else if (HTTP_PARSER_ERRNO(&parser))
+			SendHTTPError(status_code ? status_code : 400, http_errno_description((http_errno)parser.http_errno));
 	}
 
 	void ServeData()
 	{
-		InternalState = HTTP_SERVE_SEND_DATA;
-
-		claimed = false;
 		ModResult MOD_RESULT;
-		HTTPRequest acl(request_type, uri, &headers, this, ip, postdata);
+		std::string method = http_method_str(static_cast<http_method>(parser.method));
+		HTTPRequestURI parsed;
+		ParseURI(uri, parsed);
+		HTTPRequest acl(method, parsed, &headers, this, ip, body);
 		FIRST_MOD_RESULT_CUSTOM(*aclevprov, HTTPACLEventListener, OnHTTPACLCheck, MOD_RESULT, (acl));
 		if (MOD_RESULT != MOD_RES_DENY)
 		{
-			HTTPRequest url(request_type, uri, &headers, this, ip, postdata);
-			FIRST_MOD_RESULT_CUSTOM(*reqevprov, HTTPRequestEventListener, OnHTTPRequest, MOD_RESULT, (url));
+			HTTPRequest request(method, parsed, &headers, this, ip, body);
+			FIRST_MOD_RESULT_CUSTOM(*reqevprov, HTTPRequestEventListener, OnHTTPRequest, MOD_RESULT, (request));
 			if (MOD_RESULT == MOD_RES_PASSTHRU)
 			{
 				SendHTTPError(404);
@@ -339,20 +332,50 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 		}
 	}
 
-	void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
+	void Page(const std::string& s, unsigned int response, HTTPHeaders* hheaders)
 	{
-		SendHeaders(n->str().length(), response, *hheaders);
-		WriteData(n->str());
+		SendHeaders(s.length(), response, *hheaders);
+		WriteData(s);
+		BufferedSocket::Close(true);
 	}
 
-	void AddToCull()
+	void Page(std::stringstream* n, unsigned int response, HTTPHeaders* hheaders)
 	{
-		if (waitingcull)
-			return;
+		Page(n->str(), response, hheaders);
+	}
 
-		waitingcull = true;
-		Close();
-		ServerInstance->GlobalCulls.AddItem(this);
+	bool ParseURI(const std::string& uristr, HTTPRequestURI& out)
+	{
+		http_parser_url_init(&url);
+		if (http_parser_parse_url(uristr.c_str(), uristr.size(), 0, &url) != 0)
+			return false;
+
+		if (url.field_set & (1 << UF_PATH))
+			out.path = uri.substr(url.field_data[UF_PATH].off, url.field_data[UF_PATH].len);
+
+		if (url.field_set & (1 << UF_FRAGMENT))
+			out.fragment = uri.substr(url.field_data[UF_FRAGMENT].off, url.field_data[UF_FRAGMENT].len);
+
+		std::string param_str;
+		if (url.field_set & (1 << UF_QUERY))
+			param_str = uri.substr(url.field_data[UF_QUERY].off, url.field_data[UF_QUERY].len);
+
+		irc::sepstream param_stream(param_str, '&');
+		std::string token;
+		std::string::size_type eq_pos;
+		while (param_stream.GetToken(token))
+		{
+			eq_pos = token.find('=');
+			if (eq_pos == std::string::npos)
+			{
+				out.query_params.insert(std::make_pair(token, ""));
+			}
+			else
+			{
+				out.query_params.insert(std::make_pair(token.substr(0, eq_pos), token.substr(eq_pos + 1)));
+			}
+		}
+		return true;
 	}
 };
 
@@ -366,7 +389,6 @@ class HTTPdAPIImpl : public HTTPdAPIBase
 
 	void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
 	{
-		claimed = true;
 		resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
 	}
 };
@@ -386,6 +408,7 @@ class ModuleHttpServer : public Module
 	{
 		aclevprov = &acleventprov;
 		reqevprov = &reqeventprov;
+		HttpServerSocket::ConfigureParser();
 	}
 
 	void init() CXX11_OVERRIDE
@@ -396,33 +419,45 @@ class ModuleHttpServer : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
-		timeoutsec = tag->getInt("timeout", 10, 1);
+		timeoutsec = tag->getDuration("timeout", 10, 1);
 	}
 
 	ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
 	{
-		if (from->bind_tag->getString("type") != "httpd")
+		if (!stdalgo::string::equalsci(from->bind_tag->getString("type"), "httpd"))
 			return MOD_RES_PASSTHRU;
-		int port;
-		std::string incomingip;
-		irc::sockets::satoap(*client, incomingip, port);
-		sockets.push_front(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec));
+
+		sockets.push_front(new HttpServerSocket(nfd, client->addr(), from, client, server, timeoutsec));
 		return MOD_RES_ALLOW;
 	}
 
+	void OnUnloadModule(Module* mod) CXX11_OVERRIDE
+	{
+		for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); )
+		{
+			HttpServerSocket* sock = *i;
+			++i;
+			if (sock->GetModHook(mod))
+			{
+				sock->cull();
+				delete sock;
+			}
+		}
+	}
+
 	CullResult cull() CXX11_OVERRIDE
 	{
 		for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
 		{
 			HttpServerSocket* sock = *i;
-			sock->AddToCull();
+			sock->Close();
 		}
 		return Module::cull();
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
+		return Version("Allows the server administrator to serve various useful resources over HTTP.", VF_VENDOR);
 	}
 };