diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-11 16:46:31 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-11 16:46:31 +0000 |
commit | e0d38508fc8b6bc3915b2235a85a068eacfb87bf (patch) | |
tree | 75de5a3a58d59b983ce82cde4f631a318cd6f13f /src/shrpx_live_check.cc | |
parent | Releasing progress-linux version 1.61.0-1~progress7.99u1. (diff) | |
download | nghttp2-e0d38508fc8b6bc3915b2235a85a068eacfb87bf.tar.xz nghttp2-e0d38508fc8b6bc3915b2235a85a068eacfb87bf.zip |
Merging upstream version 1.62.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/shrpx_live_check.cc')
-rw-r--r-- | src/shrpx_live_check.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shrpx_live_check.cc b/src/shrpx_live_check.cc index 8e8d316..e59df5a 100644 --- a/src/shrpx_live_check.cc +++ b/src/shrpx_live_check.cc @@ -299,8 +299,8 @@ int LiveCheck::initiate_connection() { if (addr_->tls) { auto sni_name = addr_->sni.empty() ? StringRef{addr_->host} : StringRef{addr_->sni}; - if (!util::numeric_host(sni_name.c_str())) { - SSL_set_tlsext_host_name(conn_.tls.ssl, sni_name.c_str()); + if (!util::numeric_host(sni_name.data())) { + SSL_set_tlsext_host_name(conn_.tls.ssl, sni_name.data()); } auto session = tls::reuse_tls_session(addr_->tls_session_cache); @@ -411,7 +411,7 @@ int LiveCheck::tls_handshake() { switch (addr_->proto) { case Proto::HTTP1: - if (proto.empty() || proto == StringRef::from_lit("http/1.1")) { + if (proto.empty() || proto == "http/1.1"_sr) { break; } return -1; |