From: Sadie Powell Date: Fri, 14 Feb 2020 06:25:06 +0000 (+0000) Subject: Marginally improve the error pages created by httpd and httpd_acl. X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=45d5e5c7526a00784d2366bd1a2ca7d0c5384027;p=user%2Fhenk%2Fcode%2Finspircd.git Marginally improve the error pages created by httpd and httpd_acl. --- diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index cec52f66a..bdb1d50fc 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -251,10 +251,12 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru void SendHTTPError(unsigned int response) { - HTTPHeaders empty; + static HTTPHeaders empty; std::string data = InspIRCd::Format( - "Server error %u: %s
" - "Powered by InspIRCd", response, http_status_str((http_status)response)); + "" + "

Error %u

%s

" + "Powered by InspIRCd", + response, http_status_str((http_status)response)); Page(data, response, &empty); } diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 25b7a73f5..cb82b15fa 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -103,7 +103,13 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BlockAccess (%u)", returnval); - std::stringstream data("Access to this resource is denied by an access control list. Please contact your IRC administrator."); + std::stringstream data; + data << "" + << "

Error " << returnval << "

" + << "

Access to this resource is denied by an access control list.

" + << "

Please contact your IRC administrator.

" + << "Powered by InspIRCd"; + HTTPDocumentResponse response(this, *http, &data, returnval); response.headers.SetHeader("X-Powered-By", MODNAME); if (!extraheaderkey.empty())