King_DuckZ/kamokan
1
0
Fork 0
mirror of https://github.com/KingDuckZ/kamokan.git synced 2025-07-02 14:04:16 +00:00
Code Issues Releases Wiki Activity

Off by 1?

Browse source
This commit is contained in:
King_DuckZ 2017-06-04 23:05:56 +01:00
parent 87b6f85913
commit 78156cea75
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/tawashi/cgi_env.cpp
View file

@ -83,23 +83,23 @@ namespace cgi {
return optional<Env::VersionInfo>(); return optional<Env::VersionInfo>();
} }
std::size_t calculate_skip_path_length (const boost::string_ref& paPath, const boost::string_ref& parBasePath) { std::size_t calculate_skip_path_length (const boost::string_ref& parPath, const boost::string_ref& parBasePath) {
const std::size_t base_path_tr_slash = (not parBasePath.empty() and parBasePath[parBasePath.size() - 1] == '/' ? 1 : 0); const std::size_t base_path_tr_slash = (not parBasePath.empty() and parBasePath[parBasePath.size() - 1] == '/' ? 1 : 0);
boost::string_ref base_path = parBasePath.substr(0, parBasePath.size() - base_path_tr_slash); boost::string_ref base_path = parBasePath.substr(0, parBasePath.size() - base_path_tr_slash);
SPDLOG_TRACE(spdlog::get("statuslog"), "calculating skip prefix for REQUEST_URI=\"{}\", base path=\"{}\", parBasePath=\"{}\", base path trailing slash={}", SPDLOG_TRACE(spdlog::get("statuslog"), "calculating skip prefix for REQUEST_URI=\"{}\", base path=\"{}\", parBasePath=\"{}\", base path trailing slash={}",
std::string(paPath.begin(), paPath.end()), std::string(parPath.begin(), parPath.end()),
std::string(base_path.begin(), base_path.end()), std::string(base_path.begin(), base_path.end()),
std::string(parBasePath.begin(), parBasePath.end()), std::string(parBasePath.begin(), parBasePath.end()),
base_path_tr_slash base_path_tr_slash
); );
if (boost::starts_with(paPath, base_path)) { if (boost::starts_with(parPath, base_path)) {
//account for the trailing slash in either base path and path info //account for the trailing slash in either base path and path info
return std::min(parBasePath.size(), paPath.size()); return std::min(parBasePath.size(), parPath.size()) + (1 - base_path_tr_slash);
} }
else { else {
std::string str_base_path(parBasePath.begin(), parBasePath.end()); std::string str_base_path(parBasePath.begin(), parBasePath.end());
std::string str_path(paPath.begin(), paPath.end()); std::string str_path(parPath.begin(), parPath.end());
spdlog::get("statuslog")->error( spdlog::get("statuslog")->error(
"base path is not a prefix of REQUEST_URI: base path={}, REQUEST_URI={}, tawashi will most likely malfunction", "base path is not a prefix of REQUEST_URI: base path={}, REQUEST_URI={}, tawashi will most likely malfunction",
str_base_path, str_base_path,