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

feat: try to fix tester

Browse Source
This commit is contained in:
3lswear
2022-02-09 22:58:43 +03:00
parent 0103dc97dd
commit f7783460e3
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Client/Request.cpp
View File

@@ -185,18 +185,27 @@ void Request::splitData(std::string &data)
if (!_head_ok) if (!_head_ok)
{ {
pos = str.find("\r\n\r\n"); pos = str.find("\r\n\r\n");
/* if (pos == -1) */
/* { */
/* _ret = 400; */
/* return; */
/* } */
DBOUT << RED << "pos is " << pos << ENDL;
if (pos == -1) if (pos == -1)
{ {
_ret = 400; _head += str;
return; }
else
{
_head += str.substr(0, pos) + "\n";
_headerSize = _head.size() + 3;
data.erase(0, pos + 4);
_head_ok = true;
parseHeader();
if (_contentLength == 0 && !_chunked)
_body_ok = true;
} }
_head = str.substr(0, pos) + "\n";
_headerSize = _head.size() + 3;
data.erase(0, pos + 4);
_head_ok = true;
parseHeader();
if (_contentLength == 0 && !_chunked)
_body_ok = true;
} }
if (badCode(_ret)) if (badCode(_ret))
return ; return ;
@@ -336,6 +345,8 @@ bool Request::badCode(int code)
bool Request::ok(void) bool Request::ok(void)
{ {
DBOUT << "_head_ok " << _head_ok << ENDL;
DBOUT << "_body_ok " << _body_ok << ENDL;
return (_head_ok && _body_ok); return (_head_ok && _body_ok);
} }

17
src/Server/Server.cpp
View File

@@ -96,18 +96,25 @@ void Server::readSocket(Client &client, int fd)
bytes_read = recv(fd, &stringBUF[0], BUFFSIZE, 0); bytes_read = recv(fd, &stringBUF[0], BUFFSIZE, 0);
if (bytes_read == 0) if (bytes_read == 0)
{ {
DBOUT << RED << "bytes_read = 0" << ENDL;
client.allRead = true; client.allRead = true;
throw std::logic_error("JOPA CLIENTU");
return; return;
} }
/* else if (bytes_read == -1) */
/* throw std::logic_error("JOPA CLIENTU"); */
// buf[bytes_read + 1] = '\0'; // buf[bytes_read + 1] = '\0';
DBOUT << stringBUF << ENDL;
stringBUF.erase(bytes_read, stringBUF.size()); stringBUF.erase(bytes_read, stringBUF.size());
/* DBOUT << "after erase" <<ENDL; */
/* DBOUT << stringBUF << ENDL; */
client.setRawData(stringBUF); client.setRawData(stringBUF);
// client.setRawData(buf); // client.setRawData(buf);
client.increaseRecvCounter(bytes_read); client.increaseRecvCounter(bytes_read);
status = client.parseRequest(); status = client.parseRequest();
// client_map[fd].printClientInfo(); // client_map[fd].printClientInfo();
if ((bytes_read < BUFFSIZE) && client.allRecved()) if (client.allRecved())
{ {
client.allRead = true; client.allRead = true;
} }
@@ -153,7 +160,7 @@ void Server::add_to_epoll_list(int fd, unsigned int ep_events)
ev.data.fd = fd; ev.data.fd = fd;
assert(epoll_ctl(_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == 0); assert(epoll_ctl(_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == 0);
/* setNonBlock(fd); */ setNonBlock(fd);
DBOUT << YELLO DBOUT << YELLO
<< "add socket " << "add socket "
<< fd << fd
@@ -263,13 +270,13 @@ void Server::start(void)
assert( epoll_ctl(_epoll_fd, EPOLL_CTL_MOD, fd, &ev) == 0); assert( epoll_ctl(_epoll_fd, EPOLL_CTL_MOD, fd, &ev) == 0);
DBOUT << GREEN << "rearmed to EPOLLOUT" << ENDL; DBOUT << GREEN << "rearmed to EPOLLOUT" << ENDL;
} }
if (client_map[fd]->isEmpty()) /* if (client_map[fd]->isEmpty()) */
delete_client(client_map, fd); /* delete_client(client_map, fd); */
} }
else if (events & EPOLLOUT) else if (events & EPOLLOUT)
{ {
/* DBOUT << GREEN << "doing sendData" << ENDL; */ /* DBOUT << GREEN << "doing sendData" << ENDL; */
/* client_map[fd].printClientInfo(); */ client_map[fd]->printClientInfo();
sendData(*client_map[fd], fd); sendData(*client_map[fd], fd);
if (client_map[fd]->allSended()) if (client_map[fd]->allSended())
{ {