From 38aceea98f3be57e9ceffd6a388a1f04bda1a87a Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 7 May 2015 16:26:43 +0000 Subject: [PATCH] Merge r1676085 from trunk: consistently output SSLCertificateChainFile deprecation warnings Submitted by: kbrand Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1678233 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ STATUS | 5 ----- modules/ssl/ssl_engine_config.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index a04c2798c0..9fce9fd418 100644 --- a/CHANGES +++ b/CHANGES @@ -25,6 +25,10 @@ Changes with Apache 2.4.13 *) mod_status: Add more data to machine readable server-status produced when using the "?auto" query string. [Rainer Jung] + *) mod_ssl: make sure to consistently output SSLCertificateChainFile + deprecation warnings, when encountered in a VirtualHost block. + [Falco Schwarz ] + *) Allow FallbackResource to work when a directory is requested and there is no autoindex nor DirectoryIndex. [Jack , Eric Covener] diff --git a/STATUS b/STATUS index c27575b990..135b91f000 100644 --- a/STATUS +++ b/STATUS @@ -105,11 +105,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_ssl: consistently output SSLCertificateChainFile deprecation warnings - trunk patch: https://svn.apache.org/r1676085 - 2.4.x patch: trunk patch works (modulo CHANGES) - +1: kbrand, trawick, ylavic - *) mod_proxy_scgi: ProxySCGIInternalRedirect with alternate response header trunk patch: 1674510 2.4.x patch: trunk works (modulo CHANGES) diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index b3c05f523c..0d4e661d5d 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/ssl_engine_config.c @@ -854,7 +854,7 @@ const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *cmd, SSLSrvConfigRec *sc = mySrvConfig(cmd->server); const char *err; - ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_STARTUP, 0, cmd->server, + ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_STARTUP, 0, NULL, APLOGNO(02559) "The SSLCertificateChainFile directive (%s:%d) is deprecated, " "SSLCertificateFile should be used instead", -- 2.40.0