talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

404 page should not be an error, but a full default response

Browse Source
This commit is contained in:
Alex Hultman
2023-12-19 04:38:23 +01:00
parent 97e8099bc2
commit 53e835c1fa
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.h
+6
View File
@@ -216,6 +216,12 @@ public:
TemplatedApp(SocketContextOptions options = {}) {
httpContext = HttpContext<SSL>::create(Loop::get(), options);
/* Register default handler for 404 (can be overridden by user) */
this->any("/*", [](auto *res, auto */*req*/) {
res->writeStatus("404 File Not Found");
res->end("<html><body><h1>File Not Found</h1><hr><i>uWebSockets/20 Server</i></body></html>");
});
}
bool constructorFailed() {
src/HttpContext.h
-4
View File
@@ -171,10 +171,6 @@ private:
/* Route the method and URL */
selectedRouter->getUserData() = {(HttpResponse<SSL> *) s, httpRequest};
if (!selectedRouter->route(httpRequest->getCaseSensitiveMethod(), httpRequest->getUrl())) {
/* We don't care if it reaches the client or not */
us_socket_write(SSL, (us_socket_t *) s, httpErrorResponses[HTTP_ERROR_404_FILE_NOT_FOUND].data(), (int) httpErrorResponses[HTTP_ERROR_404_FILE_NOT_FOUND].length(), false);
us_socket_shutdown(SSL, (us_socket_t *) s);
/* We have to force close this socket as we have no handler for it */
us_socket_close(SSL, (us_socket_t *) s, 0, nullptr);
return nullptr;
src/HttpErrors.h
+2 -5
View File
@@ -25,8 +25,7 @@ namespace uWS {
enum HttpError {
HTTP_ERROR_505_HTTP_VERSION_NOT_SUPPORTED = 1,
HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE = 2,
HTTP_ERROR_400_BAD_REQUEST = 3,
HTTP_ERROR_404_FILE_NOT_FOUND = 4
HTTP_ERROR_400_BAD_REQUEST = 3
};
#ifndef UWS_HTTPRESPONSE_NO_WRITEMARK
@@ -37,7 +36,6 @@ static const std::string_view httpErrorResponses[] = {
"HTTP/1.1 505 HTTP Version Not Supported\r\nConnection: close\r\n\r\n<h1>HTTP Version Not Supported</h1><p>This server does not support HTTP/1.0.</p><hr><i>uWebSockets/20 Server</i>",
"HTTP/1.1 431 Request Header Fields Too Large\r\nConnection: close\r\n\r\n<h1>Request Header Fields Too Large</h1><hr><i>uWebSockets/20 Server</i>",
"HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n<h1>Bad Request</h1><hr><i>uWebSockets/20 Server</i>",
"HTTP/1.1 404 File Not Found\r\nConnection: close\r\n\r\n<h1>File Not Found</h1><hr><i>uWebSockets/20 Server</i>"
};
#else
@@ -46,8 +44,7 @@ static const std::string_view httpErrorResponses[] = {
"", /* Zeroth place is no error so don't use it */
"HTTP/1.1 505 HTTP Version Not Supported\r\nConnection: close\r\n\r\n",
"HTTP/1.1 431 Request Header Fields Too Large\r\nConnection: close\r\n\r\n",
"HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n",
"HTTP/1.1 404 File Not Found\r\nConnection: close\r\n\r\n"
"HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n"
};
#endif