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

MIME types map for correct Content-type header

Browse Source 
+ append body to string cause encoding problem, so added temp buf in Client.
This commit is contained in:
LuckyLaszlo
2022-08-05 04:24:15 +02:00
parent 3102253092
commit e596d8f093
19 changed files with 432 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
srcs/webserv/response.cpp
View File

@@ -32,6 +32,19 @@ void Webserv::_send_response(Client *client, ServerConfig &server)
return ;
}
// Body send (WIP for working binary files)
if (client->body_size)
{
ret = ::send(client->fd, client->buf, client->body_size, 0);
if (ret == -1)
{
std::perror("err send()");
std::cerr << "client.fd =" << client->fd << "\n"; // DEBUG
_close_client(client->fd);
return ;
}
}
if (client->get_headers("Connection") == "close")
_close_client(client->fd);
else
@@ -114,7 +127,7 @@ void Webserv::_error_html_response(Client *client, ServerConfig &server)
{
std::string html_page = HTML_ERROR;
::replace_all_substr(html_page, STATUS_PLACEHOLDER, _http_status[client->status]);
_append_body(client, html_page.c_str(), html_page.size());
_append_body(client, html_page.c_str(), html_page.size(), "html");
}
else
_get_file(client, server.error_pages[client->status]);
@@ -145,11 +158,10 @@ void Webserv::_get(Client *client, ServerConfig &server, LocationConfig &locatio
_get_file(client, path);
}
#define MAX_FILESIZE 1000000 // (1Mo)
void Webserv::_get_file(Client *client, const std::string &path)
{
std::ifstream ifd; // For chunk, ifstream directly in struct CLient for multiples read without close() ?
char buf[MAX_FILESIZE+1];
// char buf[MAX_FILESIZE+1];
if (access(path.c_str(), F_OK) == -1)
{
@@ -186,7 +198,7 @@ void Webserv::_get_file(Client *client, const std::string &path)
}
ifd.seekg(0, std::ios::beg);
ifd.read(buf, size);
ifd.read(client->buf, size);
if (!ifd)
{
std::cerr << path << ": ifd.read fail" << '\n';
@@ -195,15 +207,25 @@ void Webserv::_get_file(Client *client, const std::string &path)
else
{
client->status = 200;
buf[ifd.gcount()] = '\0';
_append_body(client, buf, ifd.gcount());
client->buf[ifd.gcount()] = '\0';
std::string file_ext = "";
size_t dot_pos = path.rfind(".");
std::cerr << "dot_pos = " << dot_pos << "\n";
if (dot_pos != std::string::npos && dot_pos + 1 < path.size())
file_ext = path.substr(dot_pos + 1);
std::cerr << "file_ext = " << file_ext << "\n";
client->body_size = ifd.gcount();
// WIP, pass empty body argument because append to string mess up binary file
_append_body(client, "", client->body_size, file_ext);
}
ifd.close();
}
}
void Webserv::_append_body(Client *client, const char *body, size_t body_size)
void Webserv::_append_body(Client *client, const char *body, size_t body_size, const std::string &file_extension)
{
/*
TODO : determine Content-Type
@@ -212,7 +234,12 @@ void Webserv::_append_body(Client *client, const char *body, size_t body_size)
http://nginx.org/en/docs/http/ngx_http_core_module.html#types
Need to look "conf/mime.types" of nginx. Maybe make a map<> based on that.
*/
client->response.append("Content-Type: text/html; charset=UTF-8" CRLF);
const std::string &mime_type = _mime_types[file_extension];
client->response.append("Content-Type: ");
client->response.append(mime_type);
if (mime_type.find("text/") != std::string::npos)
client->response.append("; charset=UTF-8");
client->response.append(CRLF);
client->response.append("Content-Length: ");
std::string tmp = ::itos(body_size);
@@ -220,7 +247,7 @@ void Webserv::_append_body(Client *client, const char *body, size_t body_size)
client->response.append(CRLF);
client->response.append(CRLF);
client->response.append(body);
client->response.append(body);
}
void Webserv::_post(Client *client, ServerConfig &server, LocationConfig &location)