roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-29 05:17: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

35
src/Client/Request.cpp
View File

@@ -10,6 +10,8 @@ Request::Request()
_chunked = false;
_head_ok = false;
_body_ok = false;
_received = 0;
}
Request::Request(char *str)
@@ -19,6 +21,7 @@ Request::Request(char *str)
_data = str;
_head_ok = false;
_body_ok = false;
_received = 0;
_chunked = false;
_contentLength = 0;
}
@@ -57,6 +60,10 @@ std::string Request::getLocation(void)
{
return (_location);
}
std::string Request::getConnection(void)
{
return (_connection);
}
ServerConfig *Request::getConfig(void)
{
return (_config);
@@ -82,7 +89,10 @@ unsigned int Request::getHeaderSize(void) const
{
return (_headerSize);
}
unsigned int Request::getRecved(void) const
{
return (_received);
}
void Request::setData(char *str)
{
this->_data = str;
@@ -99,7 +109,10 @@ void Request::setConfig(ServerConfig *config)
//-------------------------------------------------Parsing---------------------------------------
void Request::increaseRecvCounter(unsigned int n)
{
_received += n;
}
void Request::parseURI(std::string str)
{
std::string tmp;
@@ -142,9 +155,10 @@ int Request::parseStartLine(std::string str)
void Request::splitData(char *data)
{
int pos;
std::stringstream ss;
std::string str;
str = data;
str = std::string(data);
if (!_head_ok)
{
pos = str.find("\r\n\r\n");
@@ -165,9 +179,11 @@ void Request::splitData(char *data)
return ;
else if (!_body_ok)
{
_body += str.substr(0, str.size());
if (_body.size() >= _contentLength)
_body += str.substr(0, _received - _headerSize);
if ((_received - _headerSize) == _contentLength)
{
_body_ok = true;
}
}
}
@@ -231,8 +247,11 @@ void Request::copyFromMap()
{
std::map<std::string, std::string>::iterator it;
int pos;
//host
_host = _headerField.find("host")->second;
it = _headerField.find("host");
if (it != _headerField.end())
_host = it->second;
//content-lenght
it = _headerField.find("content-length");
@@ -246,6 +265,10 @@ void Request::copyFromMap()
if ( pos != -1)
_chunked = true;
}
//connection
it = _headerField.find("connection");
if (it != _headerField.end())
_connection = it->second;
}