From c4ef4f155894519ca132506368682ade9c13686f Mon Sep 17 00:00:00 2001 From: samih713 Date: Sun, 21 Apr 2024 04:54:24 +0400 Subject: [PATCH] chore(Server): rename is_request_ready to validate_request - moved the recv function to handle_connection for better logical separation --- sources/server/Server.cpp | 6 +++--- sources/server/Server.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/server/Server.cpp b/sources/server/Server.cpp index 0fd31cc..1a5f663 100644 --- a/sources/server/Server.cpp +++ b/sources/server/Server.cpp @@ -56,10 +56,9 @@ Server::~Server() /* ---------------------------- HANDLE CONNECTION --------------------------- */ -bool Server::is_request_ready(Request& r, fd incoming) +bool Server::validate_request(Request& r) { try { - r.recv(incoming); if (!r.parse_request(config)) return false; return true; @@ -75,7 +74,8 @@ void Server::handle_connection(fd incoming, fd_set& activeSockets) ConnectionManager::check_connection(incoming); Request& r = ConnectionManager::add_connection(incoming, activeSockets); try { - if (!is_request_ready(r, incoming)) + r.recv(incoming); + if (!validate_request(r)) return; IRequestHandler* handler = diff --git a/sources/server/Server.hpp b/sources/server/Server.hpp index fe4dd19..7db2d9f 100644 --- a/sources/server/Server.hpp +++ b/sources/server/Server.hpp @@ -35,7 +35,7 @@ class Server { const ServerConfig& config; CachedPages* cachedPages; - bool is_request_ready(Request& r, fd incoming); + bool validate_request(Request& r); void handle_connection(fd incoming, fd_set& activeSockets); /* polling strats */ void select_strat();