Commit 1060717f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1653997 from trunk: 

mod_ssl: Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context (new version of r1653906 reverted by r1653993).

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Committed/modified By: ylavic


Submitted by: ylavic
Reviewed/backported by: jim


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

CHANGES

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


Changes with Apache 2.4.13



  *) mod_ssl: 'SSLProtocol ALL' was being ignored in virtual host context. 

     PR 57100.  [Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>,

     Yann Ylavic]



  *) mod_ssl: Fix renegotiation failures redirected to an ErrorDocument.

     PR 57334.  [Yann Ylavic].

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -106,11 +106,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * mod_ssl: Fix merge of SSLProtocol ALL in virtualhost context PR57100

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

     2.4.x patch: trunk works

     +1: ylavic, covener, jim



   * mod_alias: Introduce expression parser support for Alias, ScriptAlias

     and Redirect.

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

modules/ssl/ssl_engine_config.c

+9 −1
Changes for modules/ssl/ssl_engine_config.c: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static void modssl_ctx_init(modssl_ctx_t *mctx, apr_pool_t *p) 
#endif



    mctx->protocol            = SSL_PROTOCOL_ALL;

    mctx->protocol_set        = 0;



    mctx->pphrase_dialog_type = SSL_PPTYPE_UNSET;

    mctx->pphrase_dialog_path = NULL;
@@ -254,7 +255,12 @@ static void modssl_ctx_cfg_merge(apr_pool_t *p, 
                                 modssl_ctx_t *add,

                                 modssl_ctx_t *mrg)

{

    cfgMerge(protocol, SSL_PROTOCOL_ALL);

    if (add->protocol_set) {

        mrg->protocol = add->protocol;

    }

    else {

        mrg->protocol = base->protocol;

    }



    cfgMerge(pphrase_dialog_type, SSL_PPTYPE_UNSET);

    cfgMergeString(pphrase_dialog_path);
@@ -1378,6 +1384,7 @@ const char *ssl_cmd_SSLProtocol(cmd_parms *cmd, 
{

    SSLSrvConfigRec *sc = mySrvConfig(cmd->server);



    sc->server->protocol_set = 1;

    return ssl_cmd_protocol_parse(cmd, arg, &sc->server->protocol);

}
@@ -1396,6 +1403,7 @@ const char *ssl_cmd_SSLProxyProtocol(cmd_parms *cmd, 
{

    SSLSrvConfigRec *sc = mySrvConfig(cmd->server);



    sc->proxy->protocol_set = 1;

    return ssl_cmd_protocol_parse(cmd, arg, &sc->proxy->protocol);

}

modules/ssl/ssl_private.h

+1 −0
Changes for modules/ssl/ssl_private.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ typedef struct { 
#endif



    ssl_proto_t  protocol;

    int protocol_set;



    /** config for handling encrypted keys */

    ssl_pphrase_t pphrase_dialog_type;