From: Stefan Fritsch <sf@apache.org>
Date: Sat, 8 Dec 2012 21:47:27 +0000 (+0000)
Subject: Don't claim "BIO dump follows" if it is not logged due to log level config.
X-Git-Tag: 2.5.0-alpha~6052
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b8a5d3d585ea9bb62abbb4ba5d475675c1d4639;p=thirdparty%2Fapache%2Fhttpd.git

Don't claim "BIO dump follows" if it is not logged due to log level config.


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

diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 058bf58ae50..317345d9a26 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -2032,14 +2032,20 @@ long ssl_io_data_cb(BIO *bio, int cmd,
     if (   cmd == (BIO_CB_WRITE|BIO_CB_RETURN)
         || cmd == (BIO_CB_READ |BIO_CB_RETURN) ) {
         if (rc >= 0) {
+            const char *dump = "";
+            if (APLOG_CS_IS_LEVEL(c, s, APLOG_TRACE7)) {
+                if (argp != NULL)
+                    dump = "(BIO dump follows)";
+                else
+                    dump = "(Oops, no memory buffer?)";
+            }
             ap_log_cserror(APLOG_MARK, APLOG_TRACE4, 0, c, s,
                     "%s: %s %ld/%d bytes %s BIO#%pp [mem: %pp] %s",
                     SSL_LIBRARY_NAME,
                     (cmd == (BIO_CB_WRITE|BIO_CB_RETURN) ? "write" : "read"),
                     rc, argi, (cmd == (BIO_CB_WRITE|BIO_CB_RETURN) ? "to" : "from"),
-                    bio, argp,
-                    (argp != NULL ? "(BIO dump follows)" : "(Oops, no memory buffer?)"));
-            if ((argp != NULL) && APLOG_CS_IS_LEVEL(c, s, APLOG_TRACE7))
+                    bio, argp, dump);
+            if (*dump != '\0' && argp != NULL)
                 ssl_io_data_dump(s, argp, rc);
         }
         else {