From: Jim Jagielski Date: Tue, 29 Dec 2015 16:27:11 +0000 (+0000) Subject: Merge r1715255 from trunk: X-Git-Tag: 2.4.19~322 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1f47184e3bb52bb88d2a7ed975e23057ab0e2d0;p=apache Merge r1715255 from trunk: Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1722181 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 398abe9069..fb402874bd 100644 --- a/STATUS +++ b/STATUS @@ -112,10 +112,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_ssl: Fix "warning: variable 'hssc' set but not used". - 2.4.x only, r1715255 merged in 2.4.18 missed this (trunk) hunk. - 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ssl_hssc_warning.patch - +1: ylavic, rpluem, covener PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index f369977392..5a59dcc836 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -772,8 +772,6 @@ int ssl_hook_Access(request_rec *r) && renegotiate && ((verify & SSL_VERIFY_PEER) || (verify & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))) { - SSLSrvConfigRec *hssc = mySrvConfig(handshakeserver); - #define MODSSL_CFG_CA_NE(f, sc1, sc2) \ (sc1->server->auth.f && \ (!sc2->server->auth.f || \