Fix a possibly-uninitialized warning and a boolean logic bug

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93992 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index ac1cacaf7c7696342613e5369af125166773e6e5..0d019906a4f650949c4474d1c4dde56bdebc0dad 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -331,7 +331,7 @@ int ssl_hook_Access(request_rec *r)
     STACK_OF(X509) *cert_stack;
     X509_STORE *cert_store;
     X509_STORE_CTX cert_store_ctx;
-    STACK_OF(SSL_CIPHER) *cipher_list_old, *cipher_list = NULL;
+    STACK_OF(SSL_CIPHER) *cipher_list_old=NULL, *cipher_list = NULL;
     SSL_CIPHER *cipher = NULL;
     int depth, verify_old, verify, n;
 
@@ -1127,7 +1127,7 @@ int ssl_hook_Fixup(request_rec *r)
     /*
      * Check to see if SSL is on
      */
-    if (!(sc->bEnabled || (sslconn && (ssl = sslconn->ssl)))) {
+    if (!(sc->bEnabled && sslconn && (ssl = sslconn->ssl))) {
         return DECLINED;
     }