diff options
Diffstat (limited to 'web/server')
-rw-r--r-- | web/server/apache/request.cxx | 8 | ||||
-rw-r--r-- | web/server/apache/service.cxx | 6 | ||||
-rw-r--r-- | web/server/apache/service.txx | 2 | ||||
-rw-r--r-- | web/server/mime-url-encoding.cxx | 2 | ||||
-rw-r--r-- | web/server/module.hxx | 7 |
5 files changed, 13 insertions, 12 deletions
diff --git a/web/server/apache/request.cxx b/web/server/apache/request.cxx index a413081..f6e9f15 100644 --- a/web/server/apache/request.cxx +++ b/web/server/apache/request.cxx @@ -34,9 +34,9 @@ #include <streambuf> #include <algorithm> // min() -#include <libbutl/utility.mxx> // icasecmp() -#include <libbutl/optional.mxx> -#include <libbutl/timestamp.mxx> +#include <libbutl/utility.hxx> // icasecmp() +#include <libbutl/optional.hxx> +#include <libbutl/timestamp.hxx> #include <web/server/mime-url-encoding.hxx> @@ -789,7 +789,7 @@ namespace web if (is != nullptr) { if (r != nullptr) - throw invalid_argument ("multiple uploads for '" + name + "'"); + throw invalid_argument ("multiple uploads for '" + name + '\''); r = is; } diff --git a/web/server/apache/service.cxx b/web/server/apache/service.cxx index 9fb23da..6d02c1a 100644 --- a/web/server/apache/service.cxx +++ b/web/server/apache/service.cxx @@ -15,8 +15,8 @@ #include <cstring> // strlen(), strcmp() #include <exception> -#include <libbutl/utility.mxx> // function_cast() -#include <libbutl/optional.mxx> +#include <libbutl/utility.hxx> // function_cast() +#include <libbutl/optional.hxx> #include <web/server/module.hxx> #include <web/server/apache/log.hxx> @@ -47,7 +47,7 @@ namespace web for (const auto& o: od) { auto i ( - option_descriptions_.emplace (name_ + "-" + o.first, o.second)); + option_descriptions_.emplace (name_ + '-' + o.first, o.second)); assert (i.second); *d++ = diff --git a/web/server/apache/service.txx b/web/server/apache/service.txx index 1b16d0b..9e1037b 100644 --- a/web/server/apache/service.txx +++ b/web/server/apache/service.txx @@ -8,7 +8,7 @@ #include <utility> // move() #include <exception> -#include <libbutl/utility.mxx> // operator<<(ostream, exception) +#include <libbutl/utility.hxx> // operator<<(ostream, exception) namespace web { diff --git a/web/server/mime-url-encoding.cxx b/web/server/mime-url-encoding.cxx index fd1e4e8..fd09cd2 100644 --- a/web/server/mime-url-encoding.cxx +++ b/web/server/mime-url-encoding.cxx @@ -6,7 +6,7 @@ #include <string> #include <iterator> // back_inserter -#include <libbutl/url.mxx> +#include <libbutl/url.hxx> using namespace std; using namespace butl; diff --git a/web/server/module.hxx b/web/server/module.hxx index beda73c..20f6217 100644 --- a/web/server/module.hxx +++ b/web/server/module.hxx @@ -9,13 +9,14 @@ #include <vector> #include <iosfwd> #include <chrono> +#include <memory> // enable_shared_from_this #include <cstdint> // uint16_t #include <cstddef> // size_t #include <utility> // move() #include <stdexcept> // runtime_error -#include <libbutl/path.mxx> -#include <libbutl/optional.mxx> +#include <libbutl/path.hxx> +#include <libbutl/optional.hxx> namespace web { @@ -236,7 +237,7 @@ namespace web // directories (e.g., apache/) if you need to see the code that // does this. // - class handler + class handler: public std::enable_shared_from_this<handler> { public: virtual |