From: Graham Leggett <minfrin@apache.org>
Date: Wed, 16 Sep 2009 20:06:05 +0000 (+0000)
Subject: Backport:
X-Git-Tag: 2.2.14~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a9ba94b969d04ea9f3ebda59f7df3ba97a2669d;p=thirdparty%2Fapache%2Fhttpd.git

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>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@815943 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 5e65c6b2ce3..38ac518e4fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@ Changes with Apache 2.2.14
      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]
 
diff --git a/STATUS b/STATUS
index 1893a4dacc7..6af4a1fac7c 100644
--- a/STATUS
+++ b/STATUS
@@ -94,13 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    +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 ]
 
diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index 76763e315b9..dc49eff6e41 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -188,7 +188,8 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
         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;