From: Graham Leggett <minfrin@apache.org>
Date: Wed, 9 Sep 2009 20:35:05 +0000 (+0000)
Subject: mod_ssl: The error message when SSLCertificateFile is missing should at
X-Git-Tag: 2.3.3~334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b35a6b58f10079e2baddc87856f2200f1ffcce89;p=apache

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]


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

diff --git a/CHANGES b/CHANGES
index 15e7645751..e85a560980 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.3.3
 
+  *) 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]
+
   *) mod_auth_digest: Fix null pointer when qop=none. [Dan Poirier]
 
   *) Add support for HTTP PUT to ab. [Jeff Barnes <jbarnesweb yahoo.com>]
diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index 94e3605133..c0f14d038e 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -189,7 +189,8 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
             && sc->server->pkcs7 == 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();
         }