roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-29 13:27:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: endless loading for non txt files

Browse Source
This commit is contained in:
Talyx
2022-02-01 15:58:30 +03:00
parent 88b0e49dc1
commit d3425e88a3
5 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Client/Client.cpp
View File

@@ -5,7 +5,6 @@
Client::Client()
{
allRead = false;
_received = 0;
this->_fd = -1;
this->_sended = 0;
}
@@ -13,7 +12,6 @@ Client::Client()
Client::Client(char *str)
{
allRead = false;
_received = 0;
this->_fd = -1;
this->_buff = str;
this->_sended = 0;
@@ -23,7 +21,6 @@ Client::Client(char *str)
Client::Client(char *str, ServerConfig *config)
{
allRead = false;
_received = 0;
this->_fd = -1;
this->_config = config;
this->_buff = str;
@@ -60,7 +57,7 @@ unsigned int Client::getCounter(void) const
unsigned int Client::getRecvCounter(void) const
{
return _received;
return _request.getRecved();
}
void Client::setRawData(char *str)
@@ -107,14 +104,8 @@ bool Client::allSended(void)
bool Client::allRecved(void)
{
if (_request.getContentLength() == _received)
{
std::cout << "contentLength, _received "
<< _request.getContentLength()
<< " " <<
_received << std::endl;
if (_request.getContentLength() == (_request.getRecved() - _request.getHeaderSize()))
return (true);
}
else
return (false);
}
@@ -126,9 +117,7 @@ void Client::increaseCounter(void)
void Client::increaseRecvCounter(unsigned int n)
{
if (_received == 0)
_received -= _request.getHeaderSize();
_received += n;
_request.increaseRecvCounter(n);
}
//Генерирует response. Далее респонс можно получить через функцию getStrToSend()
@@ -170,20 +159,26 @@ void Client::printClientInfo(void)
std::map<std::string, std::string>::iterator it1;
map = _request.getClientFields();
std::cout << TURQ << "Parsed request" << ZERO_C << std::endl;
std::cout << PINK << "request method = " << _request.getMethod() << ZERO_C << std::endl;
std::cout << PINK << "request URI = " << _request.getURI() << 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 http versioin = " << _request.getVersion() << ZERO_C << std::endl;
std::cout << YELLOW << "request Client:\n" << _buff << ZERO_C << std::endl;
std::cout << PINK << "content-length = " << _request.getContentLength() << ZERO_C << std::endl;
std::cout << PINK << "connection type = " << _request.getConnection() << ZERO_C << std::endl;
std::cout << TURQ << "Parsed response" << ZERO_C << std::endl;
std::cout << BLUE << _response.getHeader() << ZERO_C << std::endl;
std::cout << TURGUOISE << "Client MAP" << ZERO_C << std::endl;
for ( it = map.begin(); it != map.end() ; it++)
{
std::cout << PINK << it->first << BLUE << it->second << ZERO_C << std::endl;
}
std::cout << TURGUOISE << "Client BODY" << ZERO_C << std::endl;
std::cout << GREEN << _request.getBody().size() << 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++)
// {
// std::cout << PINK << it->first << BLUE << it->second << ZERO_C << std::endl;
// }
// std::cout << TURGUOISE << "Client BODY" << ZERO_C << std::endl;
// std::cout << GREEN << _request.getBody().size() << ZERO_C << std::endl;
/* std::cout << BLUE << _request.getBody() << ZERO_C << std::endl; */
}