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.
This commit is contained in:
Tatsuhiro Tsujikawa 2017-01-08 19:43:24 +09:00
parent c28900990a
commit 0abc220013
1 changed files with 1 additions and 16 deletions

View File

@ -1702,24 +1702,9 @@ int Http2Session::connection_made() {
return -1; return -1;
} }
auto must_terminate =
addr_->tls && !nghttp2::ssl::check_http2_requirement(conn_.tls.ssl);
reset_connection_check_timer(CONNCHK_TIMEOUT); reset_connection_check_timer(CONNCHK_TIMEOUT);
if (must_terminate) { submit_pending_requests();
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();
}
signal_write(); signal_write();
return 0; return 0;