From ad65121496823e53d879ce64445fd7a0b4cfda0f Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 3 Sep 2015 22:51:24 +0900 Subject: [PATCH] nghttpx: Fix assertion error because of empty scheme --- src/shrpx_https_upstream.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shrpx_https_upstream.cc b/src/shrpx_https_upstream.cc index 40a29593..984a6d12 100644 --- a/src/shrpx_https_upstream.cc +++ b/src/shrpx_https_upstream.cc @@ -198,6 +198,10 @@ void rewrite_request_host_path_from_uri(Downstream *downstream, const char *uri, } downstream->set_request_http2_authority(authority); + std::string scheme; + http2::copy_url_component(scheme, &u, UF_SCHEMA, uri); + downstream->set_request_http2_scheme(std::move(scheme)); + std::string path; if (u.field_set & (1 << UF_PATH)) { http2::copy_url_component(path, &u, UF_PATH, uri); @@ -225,10 +229,6 @@ void rewrite_request_host_path_from_uri(Downstream *downstream, const char *uri, downstream->set_request_path( http2::rewrite_clean_path(std::begin(path), std::end(path))); } - - std::string scheme; - http2::copy_url_component(scheme, &u, UF_SCHEMA, uri); - downstream->set_request_http2_scheme(std::move(scheme)); } } // namespace