From 0abc220013d084283ed3f65de24f8b36673cb522 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 8 Jan 2017 19:43:24 +0900 Subject: [PATCH] nghttpx: Fix the bug that no-http2-cipher-black-list does not work Because of the redundant check in backend HTTP/2 session, no-http2-cipher-black-list does not work on backend HTTP/2 connection. This commit fixes it. --- src/shrpx_http2_session.cc | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/shrpx_http2_session.cc b/src/shrpx_http2_session.cc index ce427a7f..1c7c6f37 100644 --- a/src/shrpx_http2_session.cc +++ b/src/shrpx_http2_session.cc @@ -1702,24 +1702,9 @@ int Http2Session::connection_made() { return -1; } - auto must_terminate = - addr_->tls && !nghttp2::ssl::check_http2_requirement(conn_.tls.ssl); - reset_connection_check_timer(CONNCHK_TIMEOUT); - if (must_terminate) { - if (LOG_ENABLED(INFO)) { - LOG(INFO) << "TLSv1.2 was not negotiated. HTTP/2 must not be negotiated."; - } - - rv = terminate_session(NGHTTP2_INADEQUATE_SECURITY); - - if (rv != 0) { - return -1; - } - } else { - submit_pending_requests(); - } + submit_pending_requests(); signal_write(); return 0;