From f97c88f6f64e66fe2abb38860ab1e3f8c0702439 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 8 Mar 2019 10:50:53 +0000 Subject: m_httpd: use http_response_str() instead of Response(). Lets not reinvent the wheel pointlessly. --- src/modules/m_httpd.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/modules/m_httpd.cpp') diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index e5d0a08e4..78c25f6d9 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -224,24 +224,12 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru AddToCull(); } - const char* Response(unsigned int response) - { - switch (response) - { -#define HTTP_STATUS_CASE(n, m, s) case n: return #s; - HTTP_STATUS_MAP(HTTP_STATUS_CASE) - default: - return "WTF"; - break; - } - } - void SendHTTPError(unsigned int response) { HTTPHeaders empty; std::string data = InspIRCd::Format( "Server error %u: %s
" - "Powered by InspIRCd", response, Response(response)); + "Powered by InspIRCd", response, http_status_str((http_status)response)); SendHeaders(data.length(), response, empty); WriteData(data); @@ -250,7 +238,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru 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, Response(response))); + 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))); rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true)); rheaders.CreateHeader("Server", INSPIRCD_BRANCH); -- cgit v1.3.1-10-gc9f91