From da75aead13f5869bf0d46c5ba597604f1b14cd03 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sat, 8 Dec 2012 21:47:27 +0000 Subject: [PATCH] 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 --- modules/ssl/ssl_engine_io.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 { -- 2.47.3