* modules/ssl/ssl_engine_log.c (ssl_log_cxerror): Drop 'peer' from the

  log message since the passed-in cert may be e.g. the peer's issuer.

* modules/ssl/ssl_private.h (ssl_log_cxerror): Don't mention the word
  peer here either.

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

diff --git a/modules/ssl/ssl_engine_log.c b/modules/ssl/ssl_engine_log.c
index 71efc401dfed3fbfc0ac831dd8fdd5bdbc8f2f36..2e3d2214236890870334022ea786981a27d7d1f7 100644 (file)
--- a/modules/ssl/ssl_engine_log.c
+++ b/modules/ssl/ssl_engine_log.c
@@ -132,7 +132,7 @@ void ssl_log_cxerror(const char *file, int line, int level,
     va_end(ap);
 
     ap_log_cerror(file, line, level, rv, c, 
-                  "%s [peer subject: %s, issuer: %s, serial: %s]",
+                  "%s [subject: %s, issuer: %s, serial: %s]",
                   buf,
                   sname ? sname : "-unknown-",
                   iname ? iname : "-unknown-",

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 3ef08f48a49fc66f1893f76c6381b5fc5dc003e1..46d37c631264c29c1e4436fd3590d80299e1d612 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -689,7 +689,7 @@ int          ssl_mutex_off(server_rec *);
 void         ssl_die(void);
 void         ssl_log_ssl_error(const char *, int, int, server_rec *);
 
-/* ssl_log_cxerror is a wrapper for ap_log_cerror which takes the peer
+/* ssl_log_cxerror is a wrapper for ap_log_cerror which takes a
  * certificate as an additional argument and appends details of that
  * cert to the log message.  All other arguments interpreted exactly
  * as ap_log_cerror. */