Commit b48dd0b0 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 90745f9f

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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 <hiding falco.me>]



  *) Allow FallbackResource to work when a directory is requested and

     there is no autoindex nor DirectoryIndex. 

     [Jack <tjerk.meesters gmail.com>, Eric Covener]

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -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)

modules/ssl/ssl_engine_config.c

+1 −1
Changes for modules/ssl/ssl_engine_config.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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",