42/42_INT_12_webserv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug message

Browse Source
This commit is contained in:
lperrey
2022-08-16 20:58:48 +02:00
parent 2c6bc096cc
commit 4dc70373f8
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
srcs/Client.cpp
View File

@@ -413,9 +413,9 @@ void Client::_parse_port_hostname(std::string host)
void Client::_check_request_errors() void Client::_check_request_errors()
{ {
std::cerr << "Content-Length=" << get_rq_headers("Content-Length") << "\n"; // /* Debug */ std::cerr << "Content-Length=" << get_rq_headers("Content-Length") << "\n";
std::cerr << "strtoul=" << std::strtoul(get_rq_headers("Content-Length").c_str(), NULL, 10) << "\n"; // /* Debug */ std::cerr << "strtoul=" << std::strtoul(get_rq_headers("Content-Length").c_str(), NULL, 10) << "\n";
std::cerr << "client_body_limit=" << assigned_server->client_body_limit << "\n"; // /* Debug */ std::cerr << "client_body_limit=" << assigned_server->client_body_limit << "\n";
/////////////////////// ///////////////////////
// Request line checks // Request line checks
if (_request.method == UNKNOWN) if (_request.method == UNKNOWN)
@@ -464,11 +464,11 @@ ServerConfig *Client::_determine_process_server(Client *client, std::vector<Serv
*/ */
std::string server_name = client->get_rq_headers("Host"); std::string server_name = client->get_rq_headers("Host");
std::cerr << "server_name = " << server_name << "\n"; // /* Debug */ std::cerr << "server_name = " << server_name << "\n";
size_t pos = server_name.rfind(':'); size_t pos = server_name.rfind(':');
if (pos != NPOS) if (pos != NPOS)
server_name.erase(pos); server_name.erase(pos);
std::cerr << "server_name = " << server_name << "\n"; // /* Debug */ std::cerr << "server_name = " << server_name << "\n";
std::vector<ServerConfig>::iterator it = servers.begin(); std::vector<ServerConfig>::iterator it = servers.begin();
std::vector<ServerConfig>::iterator default_server = servers.end(); std::vector<ServerConfig>::iterator default_server = servers.end();

3
srcs/cgi-bin/cgi_cpp.cpp
View File

@@ -1,5 +1,6 @@
# include "cgi_utils.hpp" # include "cgi_utils.hpp"
# include <unistd.h>
int main (int ac, char **av, char ** env) int main (int ac, char **av, char ** env)
{ {
@@ -9,6 +10,8 @@ int main (int ac, char **av, char ** env)
(void)ac; (void)ac;
(void)av; (void)av;
::sleep(30);
fill_response_basic(env, http_body, http_header); fill_response_basic(env, http_body, http_header);
std::cout << http_header << CRLF CRLF << http_body; std::cout << http_header << CRLF CRLF << http_body;

12
srcs/webserv/response.cpp
View File

@@ -66,7 +66,7 @@ int Webserv::_send_response(Client *client)
//*DEBUG*/ std::cout << "\n" B_PURPLE "[response + output + headers]:" RESET "\n"; ::print_special(client->response); std::cout << "\n" B_PURPLE "-----------" RESET "\n\n"; //*DEBUG*/ std::cout << "\n" B_PURPLE "[response + output + headers]:" RESET "\n"; ::print_special(client->response); std::cout << "\n" B_PURPLE "-----------" RESET "\n\n";
std::cerr << "client->response.size() = " << client->response.size() << "\n"; // DEBUG // /* Debug */ std::cerr << "client->response.size() = " << client->response.size() << "\n"; // DEBUG
ret = ::send(client->get_cl_fd(), client->response.c_str(), client->response.size(), 0); ret = ::send(client->get_cl_fd(), client->response.c_str(), client->response.size(), 0);
if (ret == -1) if (ret == -1)
{ {
@@ -79,7 +79,7 @@ int Webserv::_send_response(Client *client)
std::cerr << "SEND RET 0 for client.fd =" << client->get_cl_fd() << "\n"; // DEBUG std::cerr << "SEND RET 0 for client.fd =" << client->get_cl_fd() << "\n"; // DEBUG
return SEND_CLOSE; return SEND_CLOSE;
} }
std::cerr << "ret send() = " << ret << "\n"; // DEBUG // /* Debug */ std::cerr << "ret send() = " << ret << "\n"; // DEBUG
return SEND_COMPLETE; return SEND_COMPLETE;
} }
@@ -114,7 +114,7 @@ void Webserv::_construct_response(Client *client)
void Webserv::_process_method(Client *client, std::string &path) void Webserv::_process_method(Client *client, std::string &path)
{ {
std::cerr << "allow_methods = " << http_methods_to_str(client->assigned_location->allow_methods) << "\n"; // debug // /* Debug */ std::cerr << "allow_methods = " << http_methods_to_str(client->assigned_location->allow_methods) << "\n"; // debug
switch (client->get_rq_method()) switch (client->get_rq_method())
{ {
@@ -131,13 +131,13 @@ void Webserv::_process_method(Client *client, std::string &path)
std::string Webserv::_replace_url_root(Client *client, std::string path) std::string Webserv::_replace_url_root(Client *client, std::string path)
{ {
std::cerr << "assigned_location->path = " << client->assigned_location->path << "\n"; // debug // /* Debug */ std::cerr << "assigned_location->path = " << client->assigned_location->path << "\n"; // debug
std::cerr << "path before = " << path << "\n"; // DEBUG // /* Debug */ std::cerr << "path before = " << path << "\n"; // DEBUG
if (client->assigned_location->path == "/") if (client->assigned_location->path == "/")
path.insert(0, client->assigned_location->root); path.insert(0, client->assigned_location->root);
else else
path.replace(0, client->assigned_location->path.size(), client->assigned_location->root); path.replace(0, client->assigned_location->path.size(), client->assigned_location->root);
std::cerr << "path after = " << path << "\n"; // DEBUG // /* Debug */ std::cerr << "path after = " << path << "\n"; // DEBUG
return path; return path;
} }

12
srcs/webserv/run_loop.cpp
View File

@@ -18,6 +18,10 @@ void Webserv::_read_cgi_output(cgi_pipe_rfd &cgi_fd)
char buf[BUFSIZE]; char buf[BUFSIZE];
ssize_t ret; ssize_t ret;
pid_t wait_ret; pid_t wait_ret;
std::cerr << "_read_cgi_output()" << "\n";
std::cerr << "cgi_pid = " << cgi_fd.cgi_pid << "\n";
std::cerr << "client fd = " << cgi_fd.client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << cgi_fd.fd << "\n";
ret = ::read(cgi_fd.fd, buf, BUFSIZE); ret = ::read(cgi_fd.fd, buf, BUFSIZE);
std::cerr << "cgi read ret = " << ret << "\n"; std::cerr << "cgi read ret = " << ret << "\n";
@@ -28,7 +32,7 @@ void Webserv::_read_cgi_output(cgi_pipe_rfd &cgi_fd)
} }
else if (ret == 0) else if (ret == 0)
{ {
(void)0; std::cerr << "cgi read 0 :o" << "\n";
} }
else else
{ {
@@ -56,6 +60,9 @@ void Webserv::_handle_epoll_error_cgi_fd(uint32_t events, std::vector<cgi_pipe_r
{ {
(void)events; (void)events;
std::cerr << "cgi EPOLLERR" << "\n"; std::cerr << "cgi EPOLLERR" << "\n";
std::cerr << "cgi_pid = " << it->cgi_pid << "\n";
std::cerr << "client fd = " << it->client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << it->fd << "\n";
pid_t wait_ret; pid_t wait_ret;
wait_ret = ::waitpid(it->cgi_pid, NULL, WNOHANG); wait_ret = ::waitpid(it->cgi_pid, NULL, WNOHANG);
@@ -77,6 +84,9 @@ void Webserv::_cgi_epollhup(uint32_t events, std::vector<cgi_pipe_rfd>::iterator
{ {
(void)events; (void)events;
std::cerr << "cgi EPOLLHUP" << "\n"; std::cerr << "cgi EPOLLHUP" << "\n";
std::cerr << "cgi_pid = " << it->cgi_pid << "\n";
std::cerr << "client fd = " << it->client->get_cl_fd() << "\n";
std::cerr << "cgi fd = " << it->fd << "\n";
pid_t wait_ret; pid_t wait_ret;
wait_ret = ::waitpid(it->cgi_pid, NULL, WNOHANG); wait_ret = ::waitpid(it->cgi_pid, NULL, WNOHANG);