From 3eda24edb1c45c7a84b76e584c25d560bd2d9e76 Mon Sep 17 00:00:00 2001 From: Talyx Date: Sun, 30 Jan 2022 11:48:44 +0300 Subject: [PATCH] bug fix --- src/Client/Client.cpp | 6 +++--- src/Client/Request.cpp | 3 +++ src/Client/Response.cpp | 11 ++++++----- src/Client/Response.hpp | 4 ++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Client/Client.cpp b/src/Client/Client.cpp index d871ab1..3bf095a 100644 --- a/src/Client/Client.cpp +++ b/src/Client/Client.cpp @@ -99,7 +99,7 @@ int Client::sendResponse(int fd) { _response.setData(_request, _config); _response.generate(); - _headerToSend = _response.getClient(); + _headerToSend = _response.getHeader(); _bodyToSend = _response.getBody(); _ret = sendData(fd, _headerToSend + _bodyToSend); @@ -110,7 +110,7 @@ std::string Client::generateRespons(void) { _response.setData(_request, _config); _response.generate(); - _headerToSend = _response.getClient(); + _headerToSend = _response.getHeader(); _bodyToSend = _response.getBody(); _toSend = _headerToSend + _bodyToSend; @@ -138,7 +138,7 @@ void Client::printClientInfo(void) std::cout << PINK << "host = " << _request.getHost() << ZERO_C << std::endl; std::cout << PINK << "request query = " << _request.getQuery() << ZERO_C << std::endl; std::cout << PINK << "request http versioin = " << _request.getVersion() << ZERO_C << std::endl; - // std::cout << YELLOW << "request Client:\n" << _buff << ZERO_C << std::endl; + std::cout << YELLOW << "request Client:\n" << _buff << ZERO_C << std::endl; std::cout << TURGUOISE << "Client MAP" << ZERO_C << std::endl; for ( it = map.begin(); it != map.end() ; it++) diff --git a/src/Client/Request.cpp b/src/Client/Request.cpp index b4a60fd..e16445b 100644 --- a/src/Client/Request.cpp +++ b/src/Client/Request.cpp @@ -8,6 +8,9 @@ Request::Request() _ret = 200; _contentLength = 0; _chunked = false; + _head_ok = false; + _body_ok = false; + } Request::Request(char *str) diff --git a/src/Client/Response.cpp b/src/Client/Response.cpp index 6fe6661..2620833 100644 --- a/src/Client/Response.cpp +++ b/src/Client/Response.cpp @@ -9,9 +9,9 @@ Response::Response() //-------------------------------------------------GET/SET--------------------------------------- -std::string Response::getClient(void) +std::string Response::getHeader(void) { - return (_Client); + return (_header); } std::string Response::getBody(void) { @@ -65,13 +65,14 @@ void Response::invalidClient(void) { std::stringstream ss; std::string tmp; - //Client + //Header ss << _request.getVersion() << " " << _request.getCode() << " " << getReasonPhrase(_request.getCode()) << "\r\nContent-Type: text/html\r\n\r\n"; - _Client = ss.str(); + _header = ss.str(); //body _body = getErrorPage(_request.getCode()); std::cout << RED << "Invalid Client method called\nCODE: " << _request.getCode() << " " << getReasonPhrase(_request.getCode()) << ZERO_C << std::endl; + std::cout << _header << std::endl << _body << std::endl; } void Response::methodGet(void) @@ -80,7 +81,7 @@ void Response::methodGet(void) std::string tmp; //Client ss << _request.getVersion() << " " << _request.getCode() << " " << getReasonPhrase(_request.getCode()) << "\r\nContent-Type: text/html\r\n\r\n"; - _Client = ss.str(); + _header = ss.str(); //body if (!_request.badCode(_request.getCode()) && _request.isDir(_request.getFullUri()) == 0) _body = Autoindex::getPage(_request.getURI(), _request.getFullUri(), _request.getHost()); diff --git a/src/Client/Response.hpp b/src/Client/Response.hpp index 5c2b7b5..3b60915 100644 --- a/src/Client/Response.hpp +++ b/src/Client/Response.hpp @@ -9,7 +9,7 @@ class Response { private: std::string _body; - std::string _Client; + std::string _header; Request _request; ServerConfig *_config; @@ -23,7 +23,7 @@ private: void invalidClient(void); public: - std::string getClient(void); + std::string getHeader(void); std::string getBody(void); static std::string getReasonPhrase(std::string); static std::string getReasonPhrase(int);