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 398abe9069d44e7b3a03793e04a44ecbba477ca8..fb402874bdb571254f78c1505f54b550c72d92e5 100644 (file)
--- 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 f369977392fdb06836466e9e630cf930163e0e20..5a59dcc836923c19047b76a6ef5d50fd225a770c 100644 (file)
--- 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 || \