diff options
| -rw-r--r-- | icespider/fcgi/cgiRequestBase.cpp | 8 | ||||
| -rw-r--r-- | icespider/fcgi/cgiRequestBase.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/icespider/fcgi/cgiRequestBase.cpp b/icespider/fcgi/cgiRequestBase.cpp index 2b95abd..7d746b8 100644 --- a/icespider/fcgi/cgiRequestBase.cpp +++ b/icespider/fcgi/cgiRequestBase.cpp @@ -12,7 +12,7 @@ namespace ba = boost::algorithm; using namespace std::literals; -#define CGI_CONST(NAME) static const std::string_view NAME(#NAME) +#define CGI_CONST(NAME) static constexpr std::string_view NAME(#NAME) namespace IceSpider { static const auto slash_pred = boost::algorithm::is_any_of("/"); @@ -34,10 +34,10 @@ namespace IceSpider { } void - CgiRequestBase::addenv(const char * const e) + CgiRequestBase::addenv(const std::string_view e) { - if (auto eq = strchr(e, '=')) { - envmap.insert({std::string_view(e, eq - e), eq + 1}); + if (const auto eq = e.find('='); eq != std::string_view::npos) { + envmap.insert({e.substr(0, eq), e.substr(eq + 1)}); } } diff --git a/icespider/fcgi/cgiRequestBase.h b/icespider/fcgi/cgiRequestBase.h index 0c2b3a1..de99e01 100644 --- a/icespider/fcgi/cgiRequestBase.h +++ b/icespider/fcgi/cgiRequestBase.h @@ -11,7 +11,7 @@ namespace IceSpider { class CgiRequestBase : public IHttpRequest { protected: CgiRequestBase(Core * c, const char * const * const env); - void addenv(const char * const); + void addenv(const std::string_view); void initialize(); public: |