Commit 426f1919 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1685779 from trunk: 

mod_ssl: Remove deprecated SSLCertificateChainFile warning.
Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685870 13f79535-47bb-0310-9956-ffa450edef68
parent 8f27aa0c

CHANGES

+2 −0
Changes for CHANGES: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Changes with Apache 2.4.15



  *) mod_ssl: Remove deprecated SSLCertificateChainFile warning.

     [Yann Ylavic]



Changes with Apache 2.4.14

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -118,10 +118,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]





  *) mod_ssl: Remove deprecated SSLCertificateChainFile warning.

     trunk patch: http://svn.apache.org/r1685779

     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, covener, wrowe





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/ssl/ssl_engine_config.c

+0 −6
Changes for modules/ssl/ssl_engine_config.c: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -862,12 +862,6 @@ 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, NULL,

                 APLOGNO(02559)

                 "The SSLCertificateChainFile directive (%s:%d) is deprecated, "

                 "SSLCertificateFile should be used instead",

                 cmd->directive->filename, cmd->directive->line_num);



    if ((err = ssl_cmd_check_file(cmd, &arg))) {

        return err;

    }