You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/06/29 21:53:13 UTC
svn commit: r1141223 - in /httpd/httpd/trunk: CHANGES
modules/ssl/ssl_engine_pphrase.c
Author: sf
Date: Wed Jun 29 19:53:13 2011
New Revision: 1141223
URL: http://svn.apache.org/viewvc?rev=1141223&view=rev
Log:
Add some debug logging when loading server certificates
PR: 37912
Submitted by: Nick Burch <nick burch alfresco com>
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1141223&r1=1141222&r2=1141223&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Jun 29 19:53:13 2011
@@ -2,6 +2,8 @@
Changes with Apache 2.3.14
+ *) mod_ssl: Add some debug logging when loading server certificates.
+ PR 37912. [Nick Burch <nick burch alfresco com>]
Changes with Apache 2.3.13
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c?rev=1141223&r1=1141222&r2=1141223&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c Wed Jun 29 19:53:13 2011
@@ -178,11 +178,14 @@ void ssl_pphrase_Handle(server_rec *s, a
*/
for (pServ = s; pServ != NULL; pServ = pServ->next) {
sc = mySrvConfig(pServ);
-
- if (!sc->enabled)
+ cpVHostID = ssl_util_vhostid(p, pServ);
+ if (!sc->enabled) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, pServ,
+ "SSL not enabled on vhost %s, skipping SSL setup",
+ cpVHostID);
continue;
+ }
- cpVHostID = ssl_util_vhostid(p, pServ);
ap_log_error(APLOG_MARK, APLOG_INFO, 0, pServ,
"Loading certificate & private key of SSL-aware server '%s'",
cpVHostID);
@@ -235,6 +238,9 @@ void ssl_pphrase_Handle(server_rec *s, a
ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s);
ssl_die();
}
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+ "Init: Read server certificate from '%s'",
+ szPath);
}
/*
* check algorithm type of certificate and make
@@ -452,8 +458,9 @@ void ssl_pphrase_Handle(server_rec *s, a
}
}
else {
- ap_log_error(APLOG_MARK, APLOG_EMERG, 0,
- pServ, "Init: Pass phrase incorrect");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, pServ,
+ "Init: Pass phrase incorrect for key of %s",
+ cpVHostID);
ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, pServ);
if (writetty) {