diff --git a/src/shrpx_client_handler.cc b/src/shrpx_client_handler.cc index 4b12d1c1..fa814dd9 100644 --- a/src/shrpx_client_handler.cc +++ b/src/shrpx_client_handler.cc @@ -975,7 +975,7 @@ int ClientHandler::proxy_protocol_read() { --end; - constexpr const char HEADER[] = "PROXY "; + constexpr char HEADER[] = "PROXY "; if (static_cast(end - rb_.pos) < str_size(HEADER)) { if (LOG_ENABLED(INFO)) { diff --git a/src/util.cc b/src/util.cc index 32669dea..b2d0ca1c 100644 --- a/src/util.cc +++ b/src/util.cc @@ -66,15 +66,15 @@ namespace util { const char UPPER_XDIGITS[] = "0123456789ABCDEF"; bool in_rfc3986_unreserved_chars(const char c) { - static constexpr const char unreserved[] = {'-', '.', '_', '~'}; + static constexpr char unreserved[] = {'-', '.', '_', '~'}; return is_alpha(c) || is_digit(c) || std::find(std::begin(unreserved), std::end(unreserved), c) != std::end(unreserved); } bool in_rfc3986_sub_delims(const char c) { - static constexpr const char sub_delims[] = {'!', '$', '&', '\'', '(', ')', - '*', '+', ',', ';', '='}; + static constexpr char sub_delims[] = {'!', '$', '&', '\'', '(', ')', + '*', '+', ',', ';', '='}; return std::find(std::begin(sub_delims), std::end(sub_delims), c) != std::end(sub_delims); } @@ -117,15 +117,14 @@ std::string percent_encode_path(const std::string &s) { } bool in_token(char c) { - static constexpr const char extra[] = {'!', '#', '$', '%', '&', - '\'', '*', '+', '-', '.', - '^', '_', '`', '|', '~'}; + static constexpr char extra[] = {'!', '#', '$', '%', '&', '\'', '*', '+', + '-', '.', '^', '_', '`', '|', '~'}; return is_alpha(c) || is_digit(c) || std::find(std::begin(extra), std::end(extra), c) != std::end(extra); } bool in_attr_char(char c) { - static constexpr const char bad[] = {'*', '\'', '%'}; + static constexpr char bad[] = {'*', '\'', '%'}; return util::in_token(c) && std::find(std::begin(bad), std::end(bad), c) == std::end(bad); } diff --git a/src/util.h b/src/util.h index e460599b..2582ba61 100644 --- a/src/util.h +++ b/src/util.h @@ -54,14 +54,14 @@ namespace nghttp2 { // The additional HTTP/2 protocol ALPN protocol identifier we also // supports for our applications to make smooth migration into final // h2 ALPN ID. -constexpr const char NGHTTP2_H2_16_ALPN[] = "\x5h2-16"; -constexpr const char NGHTTP2_H2_16[] = "h2-16"; +constexpr char NGHTTP2_H2_16_ALPN[] = "\x5h2-16"; +constexpr char NGHTTP2_H2_16[] = "h2-16"; -constexpr const char NGHTTP2_H2_14_ALPN[] = "\x5h2-14"; -constexpr const char NGHTTP2_H2_14[] = "h2-14"; +constexpr char NGHTTP2_H2_14_ALPN[] = "\x5h2-14"; +constexpr char NGHTTP2_H2_14[] = "h2-14"; -constexpr const char NGHTTP2_H1_1_ALPN[] = "\x8http/1.1"; -constexpr const char NGHTTP2_H1_1[] = "http/1.1"; +constexpr char NGHTTP2_H1_1_ALPN[] = "\x8http/1.1"; +constexpr char NGHTTP2_H1_1[] = "http/1.1"; namespace util {