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

Append the protocol to the uri from the code.

Browse source 
This means if you set uri name to http://example.com in the
config file you will actually get base_uri to be
http://http://example.com.
This commit is contained in:
King_DuckZ 2017-05-18 18:42:12 +01:00
parent 59a5d35ee0
commit c5f2bc055a
6 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tawashi_implem/response.cpp
View file

@ -106,6 +106,16 @@ namespace tawashi {
std::string disable_mstch_escaping (const std::string& parStr) {
return parStr;
};
std::string make_base_uri (const boost::string_ref& parBaseURI, bool parHttps) {
std::ostringstream oss;
if (parHttps)
oss << "https://";
else
oss << "http://";
oss << parBaseURI;
return oss.str();
}
} //unnamed namespace
Response::Response (
@ -119,6 +129,7 @@ namespace tawashi {
m_cgi_env(parCgiEnv),
m_settings(parSettings),
m_website_root(make_root_path(*parSettings)),
m_base_uri(make_base_uri(m_settings->at("base_uri"), m_cgi_env->https())),
m_resp_type(ContentType),
m_stream_out(parStreamOut),
m_header_sent(false)
@ -158,7 +169,7 @@ namespace tawashi {
SPDLOG_TRACE(statuslog, "Preparing mustache dictionary");
mstch::map mustache_context {
{"version", std::string{STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH)}},
{"base_uri", m_settings->as<std::string>("base_uri")},
{"base_uri", std::string(base_uri())},
{"languages", make_mstch_langmap(*m_settings)}
};
@ -225,8 +236,8 @@ namespace tawashi {
m_resp_value = std::move(parValue);
}
const boost::string_ref& Response::base_uri() const {
return m_settings->at("base_uri");
const std::string& Response::base_uri() const {
return m_base_uri;
}
std::string Response::load_mustache() const {