From: Kaspar Brand Date: Sat, 24 Dec 2011 06:27:02 +0000 (+0000) Subject: merge r1222915 from trunk: X-Git-Tag: 2.4.0~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61cfa5b30f47c4297cc7b480b3559d7885e56176;p=apache merge r1222915 from trunk: REMOTE_ADDR is now r->useragent_ip, which is not/never available at SSL_CB_HANDSHAKE_DONE time. ap_log_cerror() already logs c->client_ip for us, however, so we can simply drop REMOTE_ADDR from the message. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1222916 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index a4703933b6..9092440df5 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -1879,9 +1879,7 @@ static void log_tracing_state(const SSL *ssl, conn_rec *c, */ if (where & SSL_CB_HANDSHAKE_DONE) { ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(02041) - "Connection: Client IP: %s, Protocol: %s, " - "Cipher: %s (%s/%s bits)", - ssl_var_lookup(NULL, s, c, NULL, "REMOTE_ADDR"), + "Protocol: %s, Cipher: %s (%s/%s bits)", ssl_var_lookup(NULL, s, c, NULL, "SSL_PROTOCOL"), ssl_var_lookup(NULL, s, c, NULL, "SSL_CIPHER"), ssl_var_lookup(NULL, s, c, NULL, "SSL_CIPHER_USEKEYSIZE"),