svn commit: r815943 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/ssl/ssl_engine_pphrase.c

[mi...@apache.org]

Author: minfrin
Date: Wed Sep 16 20:06:05 2009
New Revision: 815943

URL: http://svn.apache.org/viewvc?rev=815943&view=rev
Log:
Backport:
mod_ssl: The error message when SSLCertificateFile is missing should
at least give the name or position of the problematic virtual host
definition.
Submitted by: Stefan Fritsch <sf sfritsch.de>

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_pphrase.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=815943&r1=815942&r2=815943&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Sep 16 20:06:05 2009
@@ -9,6 +9,10 @@
      mod_proxy_ftp: NULL pointer dereference on error paths.
      [Stefan Fritsch <sf fritsch.de>, Joe Orton]
 
+  *) mod_ssl: The error message when SSLCertificateFile is missing should
+     at least give the name or position of the problematic virtual host
+     definition. [Stefan Fritsch sf sfritsch.de]
+
   *) htdbm: Fix possible buffer overflow if dbm database has very
      long values.  PR 30586 [Dan Poirier]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=815943&r1=815942&r2=815943&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Sep 16 20:06:05 2009
@@ -94,13 +94,6 @@
    +1: covener, poirier
    +1: minfrin (with r814779 for compiler warning fix)
 
- * mod_ssl: The error message when SSLCertificateFile is missing should
-   at least give the name or position of the problematic virtual host
-   definition.
-   Trunk Patch: http://svn.apache.org/viewvc?rev=813105&view=rev
-   2.2.x Patch: http://people.apache.org/~minfrin/ssl_engine_pphrase.diff
-   +1: minfrin, rpluem, pquerna
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_pphrase.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_pphrase.c?rev=815943&r1=815942&r2=815943&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_pphrase.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_pphrase.c Wed Sep 16 20:06:05 2009
@@ -188,7 +188,8 @@
         if (sc->server->pks->cert_files[0] == NULL) {
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, pServ,
                          "Server should be SSL-aware but has no certificate "
-                         "configured [Hint: SSLCertificateFile]");
+                         "configured [Hint: SSLCertificateFile] (%s:%d)",
+                         pServ->defn_name, pServ->defn_line_number);
             ssl_die();
         }
         algoCert = SSL_ALGO_UNKNOWN;