don't bother setting the ssl info callback unless SSLLogLevel >= info

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index cbb86d1f7aefb817da302dcde7cc2c9d4c2be49b..a13aa7199aec77434afc12e06c78ebfb5ebe46fa 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -561,7 +561,11 @@ void ssl_init_ConfigureServer(server_rec *s, apr_pool_t *p, SSLSrvConfigRec *sc)
     SSL_CTX_sess_set_remove_cb(ctx,   ssl_callback_DelSessionCacheEntry);
     SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
     SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
-    SSL_CTX_set_info_callback(ctx,    ssl_callback_LogTracingState);
+
+    if (sc->nLogLevel >= SSL_LOG_INFO) {
+        /* this callback only logs if SSLLogLevel >= info */
+        SSL_CTX_set_info_callback(ctx,ssl_callback_LogTracingState);
+    }
 
     /*
      *  Configure SSL Cipher Suite

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index bb8bd104b704c72c337a6c387ca1d8248b219a84..14d1cd6fe3bd7fc0f203c4c3ff1e0f1e0863c22d 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -1654,11 +1654,6 @@ void ssl_callback_LogTracingState(SSL *ssl, int where, int rc)
     if ((sc = mySrvConfig(s)) == NULL)
         return;
 
-    if (sc->nLogLevel < SSL_LOG_INFO) {
-        /* nothing todo here */
-        return;
-    }
-
     /*
      * create the various trace messages
      */