Commit 6f2e0a7a authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Add some debug logging when loading server certificates 

PR: 37912
Submitted by: Nick Burch <nick burch alfresco com>



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

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -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

modules/ssl/ssl_engine_pphrase.c

+12 −5
Original line number Diff line number Diff line
@@ -178,11 +178,14 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) 
     */

    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, apr_pool_t *p) 
                    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, apr_pool_t *p) 
                    }

                }

                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) {