From 19707aac550b95829ff5101008503293426e29fe Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 1 Oct 2016 15:24:25 +0900 Subject: [PATCH] nghttpx: Use StringRef for sni_name_ --- src/shrpx_memcached_connection.cc | 4 ++-- src/shrpx_memcached_connection.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shrpx_memcached_connection.cc b/src/shrpx_memcached_connection.cc index 77e55747..f4bc7b6e 100644 --- a/src/shrpx_memcached_connection.cc +++ b/src/shrpx_memcached_connection.cc @@ -100,7 +100,7 @@ MemcachedConnection::MemcachedConnection(const Address *addr, connectcb, readcb, timeoutcb, this, 0, 0., PROTO_MEMCACHED), do_read_(&MemcachedConnection::noop), do_write_(&MemcachedConnection::noop), - sni_name_(sni_name.str()), + sni_name_(sni_name), connect_blocker_(gen, loop, [] {}, [] {}), parse_state_{}, addr_(addr), @@ -268,7 +268,7 @@ int MemcachedConnection::tls_handshake() { auto &tlsconf = get_config()->tls; if (!tlsconf.insecure && - ssl::check_cert(conn_.tls.ssl, addr_, StringRef(sni_name_)) != 0) { + ssl::check_cert(conn_.tls.ssl, addr_, sni_name_) != 0) { connect_blocker_.on_failure(); return -1; } diff --git a/src/shrpx_memcached_connection.h b/src/shrpx_memcached_connection.h index 858d3001..f2837a5c 100644 --- a/src/shrpx_memcached_connection.h +++ b/src/shrpx_memcached_connection.h @@ -135,7 +135,7 @@ private: std::deque> sendq_; std::deque sendbufv_; std::function do_read_, do_write_; - std::string sni_name_; + StringRef sni_name_; ssl::TLSSessionCache tls_session_cache_; ConnectBlocker connect_blocker_; MemcachedParseState parse_state_;