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

a few more things for location picker

Browse Source
This commit is contained in:
Me
2022-08-11 00:36:24 +02:00
parent 69c1a6f6bf
commit 0b51d13f13
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
srcs/config/parser.cpp
View File

@@ -232,8 +232,9 @@ void ConfigParser::_set_server_values(ServerConfig *server, \
else if (key == "root" && size == 1 && server->root == "")
{
// remove trailing /
if (tmp_val[0][tmp_val[0].size() - 1] == '/')
tmp_val[0].erase(tmp_val[0].size() - 1, 1);
if (tmp_val[0][tmp_val[0].size() - 1] != '/')
tmp_val[0].push_back('/');
// tmp_val[0].erase(tmp_val[0].size() - 1, 1);
server->root = tmp_val[0];
}
else if (key == "client_body_limit" && size == 1 \
@@ -280,9 +281,10 @@ void ConfigParser::_set_location_values(LocationConfig *location, \
throw std::invalid_argument("missing value");
else if (key == "root" && size == 1 && location->root == "")
{
// remove trailing /
if (tmp_val[0][tmp_val[0].size() - 1] == '/')
tmp_val[0].erase(tmp_val[0].size() - 1, 1);
// add trailing /
if (tmp_val[0][tmp_val[0].size() - 1] != '/')
tmp_val[0].push_back('/');
// tmp_val[0].erase(tmp_val[0].size() - 1, 1);
location->root = tmp_val[0];
}
else if (key == "autoindex" && size == 1)