From e202b9cd77b39fc5cc5a2e500e6adc33beadc7eb Mon Sep 17 00:00:00 2001 From: y-syo Date: Sat, 12 Jul 2025 18:01:43 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20fixed?= =?UTF-8?q?=20things?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/webserv.hpp | 4 ++-- .../requestImplementation/Post.cpp | 13 +++++++------ src/server/Client.cpp | 7 ++++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/includes/webserv.hpp b/includes/webserv.hpp index 26135a9..b850130 100644 --- a/includes/webserv.hpp +++ b/includes/webserv.hpp @@ -6,7 +6,7 @@ /* By: mmoussou end(); \ it++ -#define BUFFER_SIZE 4096 +#define BUFFER_SIZE 1024 namespace webserv {} // namespace webserv diff --git a/src/requests_handling/requestImplementation/Post.cpp b/src/requests_handling/requestImplementation/Post.cpp index 2735e2c..fa00385 100644 --- a/src/requests_handling/requestImplementation/Post.cpp +++ b/src/requests_handling/requestImplementation/Post.cpp @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/30 09:50:20 by adjoly #+# #+# */ -/* Updated: 2025/07/12 13:48:25 by adjoly ### ########.fr */ +/* Updated: 2025/07/12 18:00:40 by mmoussou ### ########.fr */ /* */ /* ************************************************************************** */ @@ -59,12 +59,12 @@ void Post::parse(std::string const &data) { } _route = _srv->whatRoute(URL(_target)); - if (_route->getMaxBody() != -1 && + /*if (_route->getMaxBody() != -1 && (int32_t)_body.length() > _route->getMaxBody()) { _method = "413"; _log->warn("post body too large"); return; - } + }*/ _url = new URL(_target); @@ -100,7 +100,7 @@ std::string Post::extractFilename(const std::string &header) { void Post::handleMultipartData(const std::string &body, const std::string &boundary) { - _log->info("handling MultipartData upload..."); + _log->debug("handling MultipartData upload..."); size_t i = 0; std::string delim = "--" + boundary; delim.erase(delim.size() - 1); @@ -132,18 +132,19 @@ void Post::handleMultipartData(const std::string &body, } void Post::handleBinaryUpload() { - _log->info("handling binary upload..."); + _log->debug("handling binary upload..."); std::cout << (this->_route->getUpRoot() + this->_target) << std::endl; std::ofstream outfile((this->_route->getUpRoot() + this->_target).c_str(), std::ios::binary); if (outfile.is_open()) { outfile.write(this->_body.data(), this->_body.length()); - outfile.close(); } else { _log->error("open failed D:"); + outfile.close(); throw std::runtime_error("open failed"); } + outfile.close(); } Response Post::execute(void) { diff --git a/src/server/Client.cpp b/src/server/Client.cpp index 78c8b42..e605861 100644 --- a/src/server/Client.cpp +++ b/src/server/Client.cpp @@ -6,7 +6,7 @@ /* By: mmoussou error("failed to receive request"); throw std::runtime_error("failed to receive request"); } + size_t tmp_size = received_data.length(); _getRequest(received_data); if (_request == not_nullptr) @@ -117,8 +118,8 @@ void Client::parse(void) (_request->getMethod() == "DELETE" && !_route->getMethods()[2])) this->_request->setMethod("405"); - // if (received_data.length() > (unsigned long)(_route->getMaxBody())) - // this->_request->setMethod("413"); + if (tmp_size > (unsigned long)(_route->getMaxBody())) + this->_request->setMethod("413"); } bool Client::requestParsed(void) {