From 9320d83378feb20457411c49f03f76bbb5f1fc45 Mon Sep 17 00:00:00 2001 From: Quinten Date: Tue, 30 Sep 2025 18:02:13 +0200 Subject: [PATCH] feat: add custom 400 error page and update configuration for error handling --- config/default.conf | 3 ++- 400.html => error_pages/400.html | 0 webserv/handler/Errorhandler.cpp | 2 +- webserv/server/Server.cpp | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) rename 400.html => error_pages/400.html (100%) diff --git a/config/default.conf b/config/default.conf index 25e0f23..58d1a4f 100644 --- a/config/default.conf +++ b/config/default.conf @@ -1,5 +1,6 @@ autoindex on -error_page 400 ./400.html +error_page 400 ./error_pages/400.html +error_page 500 ./error_pages/500.html diff --git a/400.html b/error_pages/400.html similarity index 100% rename from 400.html rename to error_pages/400.html diff --git a/webserv/handler/Errorhandler.cpp b/webserv/handler/Errorhandler.cpp index f7db9fa..91ceb59 100644 --- a/webserv/handler/Errorhandler.cpp +++ b/webserv/handler/Errorhandler.cpp @@ -61,7 +61,7 @@ std::string ErrorHandler::getErrorPageFile(const std::string &path) if (!file.is_open()) { Log::error("Could not open custom error page: " + path); - return generateErrorPage(Http::StatusCode::INTERNAL_SERVER_ERROR); + return generateDefaultErrorPage(Http::StatusCode::INTERNAL_SERVER_ERROR); } std::stringstream buffer; buffer << file.rdbuf(); diff --git a/webserv/server/Server.cpp b/webserv/server/Server.cpp index 37cf957..35e7fbf 100644 --- a/webserv/server/Server.cpp +++ b/webserv/server/Server.cpp @@ -83,8 +83,6 @@ void Server::removeClient(const Client &client) Log::trace(LOCATION); int client_fd = client.getSocket().getFd(); clients_.erase(client_fd); - // removeFromEpoll(client.getSocket()); - // close(client_fd); } void Server::removeFromEpoll(const Socket &socket) const