get rid of ssl_log_applies() function. it does more than we need and

what should be done with a macro.  it was only used once anyhow.
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 050a1ed6ca93d57a2a90d2c08337ef1a4c6f4d3e..325cc164616a05db0d060b869460052f6f3a24b0 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -711,7 +711,6 @@ int          ssl_mutex_kill(server_rec *);
 
 /*  Logfile Support  */
 void         ssl_log_open(server_rec *, server_rec *, apr_pool_t *);
-BOOL         ssl_log_applies(server_rec *, int);
 void         ssl_log(server_rec *, int, const char *, ...);
 void         ssl_die(void);
 

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 4ffe1f0c69ec5000024aa651fc81ac34f316f5f3..1ae0857548aa45ff6c8c31c11eb7195712bf3cb8 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -1406,7 +1406,7 @@ int ssl_callback_SSLVerify_CRL(
          * Log information about CRL
          * (A little bit complicated because of ASN.1 and BIOs...)
          */
-        if (ssl_log_applies(s, SSL_LOG_TRACE)) {
+        if (sc->nLogLevel >= SSL_LOG_TRACE) {
             bio = BIO_new(BIO_s_mem());
             BIO_printf(bio, "lastUpdate: ");
             ASN1_UTCTIME_print(bio, X509_CRL_get_lastUpdate(crl));

diff --git a/modules/ssl/ssl_engine_log.c b/modules/ssl/ssl_engine_log.c
index 19cba44e37912aa6da2027ded688d3102523ad11..e0b599dc190646c743b073ded0cb840cd0a550cf 100644 (file)
--- a/modules/ssl/ssl_engine_log.c
+++ b/modules/ssl/ssl_engine_log.c
@@ -162,20 +162,6 @@ static char *ssl_log_annotation(char *error)
     return errstr;
 }
 
-BOOL ssl_log_applies(server_rec *s, int level)
-{
-    SSLSrvConfigRec *sc;
-
-    sc = mySrvConfig(s);
-    if (   sc->fileLogFile == NULL
-        && !(level & SSL_LOG_ERROR))
-        return FALSE;
-    if (   level > sc->nLogLevel
-        && !(level & SSL_LOG_ERROR))
-        return FALSE;
-    return TRUE;
-}
-
 void ssl_log(server_rec *s, int level, const char *msg, ...)
 {
     char tstr[80];