mirror of
https://github.com/3lswear/webserv.git
synced 2025-10-28 21:07:59 +03:00
bug fix
This commit is contained in:
@@ -99,7 +99,7 @@ int Client::sendResponse(int fd)
|
|||||||
{
|
{
|
||||||
_response.setData(_request, _config);
|
_response.setData(_request, _config);
|
||||||
_response.generate();
|
_response.generate();
|
||||||
_headerToSend = _response.getClient();
|
_headerToSend = _response.getHeader();
|
||||||
_bodyToSend = _response.getBody();
|
_bodyToSend = _response.getBody();
|
||||||
_ret = sendData(fd, _headerToSend + _bodyToSend);
|
_ret = sendData(fd, _headerToSend + _bodyToSend);
|
||||||
|
|
||||||
@@ -110,7 +110,7 @@ std::string Client::generateRespons(void)
|
|||||||
{
|
{
|
||||||
_response.setData(_request, _config);
|
_response.setData(_request, _config);
|
||||||
_response.generate();
|
_response.generate();
|
||||||
_headerToSend = _response.getClient();
|
_headerToSend = _response.getHeader();
|
||||||
_bodyToSend = _response.getBody();
|
_bodyToSend = _response.getBody();
|
||||||
_toSend = _headerToSend + _bodyToSend;
|
_toSend = _headerToSend + _bodyToSend;
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@ void Client::printClientInfo(void)
|
|||||||
std::cout << PINK << "host = " << _request.getHost() << ZERO_C << std::endl;
|
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 query = " << _request.getQuery() << ZERO_C << std::endl;
|
||||||
std::cout << PINK << "request http versioin = " << _request.getVersion() << 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;
|
std::cout << TURGUOISE << "Client MAP" << ZERO_C << std::endl;
|
||||||
for ( it = map.begin(); it != map.end() ; it++)
|
for ( it = map.begin(); it != map.end() ; it++)
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ Request::Request()
|
|||||||
_ret = 200;
|
_ret = 200;
|
||||||
_contentLength = 0;
|
_contentLength = 0;
|
||||||
_chunked = false;
|
_chunked = false;
|
||||||
|
_head_ok = false;
|
||||||
|
_body_ok = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Request::Request(char *str)
|
Request::Request(char *str)
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ Response::Response()
|
|||||||
|
|
||||||
//-------------------------------------------------GET/SET---------------------------------------
|
//-------------------------------------------------GET/SET---------------------------------------
|
||||||
|
|
||||||
std::string Response::getClient(void)
|
std::string Response::getHeader(void)
|
||||||
{
|
{
|
||||||
return (_Client);
|
return (_header);
|
||||||
}
|
}
|
||||||
std::string Response::getBody(void)
|
std::string Response::getBody(void)
|
||||||
{
|
{
|
||||||
@@ -65,13 +65,14 @@ void Response::invalidClient(void)
|
|||||||
{
|
{
|
||||||
std::stringstream ss;
|
std::stringstream ss;
|
||||||
std::string tmp;
|
std::string tmp;
|
||||||
//Client
|
//Header
|
||||||
ss << _request.getVersion() << " " << _request.getCode() << " " << getReasonPhrase(_request.getCode()) << "\r\nContent-Type: text/html\r\n\r\n";
|
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
|
||||||
_body = getErrorPage(_request.getCode());
|
_body = getErrorPage(_request.getCode());
|
||||||
std::cout << RED << "Invalid Client method called\nCODE: " << _request.getCode() << " " << getReasonPhrase(_request.getCode()) << ZERO_C << std::endl;
|
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)
|
void Response::methodGet(void)
|
||||||
@@ -80,7 +81,7 @@ void Response::methodGet(void)
|
|||||||
std::string tmp;
|
std::string tmp;
|
||||||
//Client
|
//Client
|
||||||
ss << _request.getVersion() << " " << _request.getCode() << " " << getReasonPhrase(_request.getCode()) << "\r\nContent-Type: text/html\r\n\r\n";
|
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
|
||||||
if (!_request.badCode(_request.getCode()) && _request.isDir(_request.getFullUri()) == 0)
|
if (!_request.badCode(_request.getCode()) && _request.isDir(_request.getFullUri()) == 0)
|
||||||
_body = Autoindex::getPage(_request.getURI(), _request.getFullUri(), _request.getHost());
|
_body = Autoindex::getPage(_request.getURI(), _request.getFullUri(), _request.getHost());
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class Response
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::string _body;
|
std::string _body;
|
||||||
std::string _Client;
|
std::string _header;
|
||||||
Request _request;
|
Request _request;
|
||||||
ServerConfig *_config;
|
ServerConfig *_config;
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ private:
|
|||||||
void invalidClient(void);
|
void invalidClient(void);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
std::string getClient(void);
|
std::string getHeader(void);
|
||||||
std::string getBody(void);
|
std::string getBody(void);
|
||||||
static std::string getReasonPhrase(std::string);
|
static std::string getReasonPhrase(std::string);
|
||||||
static std::string getReasonPhrase(int);
|
static std::string getReasonPhrase(int);
|
||||||
|
|||||||
Reference in New Issue
Block a user