Merge remote-tracking branch 'origin/fara' into test-client-handle

This commit is contained in:
3lswear
2022-02-05 19:35:55 +03:00
2 changed files with 9 additions and 6 deletions

View File

@@ -4,27 +4,28 @@
Client::Client()
{
DBOUT << "Client constructor " << this << ENDL;
allRead = false;
done = false;
this->_fd = -1;
this->_sended = 0;
_to_send_char = NULL;
}
Client::Client(char *str)
{
DBOUT << "Client constructor " << this << ENDL;
allRead = false;
done = false;
this->_fd = -1;
this->_buff = str;
this->_sended = 0;
_to_send_char = NULL;
}
Client::Client(char *str, ServerConfig *config)
{
DBOUT << "Client constructor " << this << ENDL;
_to_send_char = NULL;
allRead = false;
done = false;
this->_fd = -1;
@@ -237,10 +238,11 @@ void Client::clear(void)
_bodyToSend = "";
_headerToSend = "";
_toSend = "";
free(_to_send_char);
if (_to_send_char)
free(_to_send_char);
}
Client::~Client()
{
DBOUT << "client destructor called " << this << ENDL;
DBOUT << "client destructor called" << ENDL;
}

View File

@@ -87,7 +87,7 @@ void Server::readSocket(Client &client, int fd)
int status;
int bytes_read;
char buf[BUFFSIZE + 1] = {0};
char buf[BUFFSIZE + 1];
DBOUT << TURQ << "IN readSocket" << RESET << std::endl;
DBOUT << "client in readSocket "<< &client << ENDL;
@@ -97,6 +97,7 @@ void Server::readSocket(Client &client, int fd)
client.allRead = true;
return;
}
buf[bytes_read + 1] = '\0';
client.setRawData(buf);
client.increaseRecvCounter(bytes_read);
status = client.parseRequest();