Commit 3c1bdb9f authored by Stefan Eissing's avatar Stefan Eissing
Browse files

backport of r1718514,1721313 

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

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -112,13 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) mod_ssl: Constify + save a few bytes in conf pool when parsing SSLRequire

     mod_nw_ssl: Save a few bytes in conf pool when processing 'NWSSLTrustedCerts'

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

                  http://svn.apache.org/r1721313 (untested because I don't have this system)

     2.4.x patch: trunk works

     +1: jailletc36, jim, icing

     

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/arch/netware/mod_nw_ssl.c

+2 −2
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static const char *set_trusted_certs(cmd_parms *cmd, void *dummy, char *arg) 
{

    char **ptr = (char **)apr_array_push(certlist);



    *ptr = apr_pstrdup(cmd->pool, arg);

    *ptr = arg;

    return NULL;

}

modules/ssl/ssl_engine_config.c

+1 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ const char *ssl_cmd_SSLRequire(cmd_parms *cmd, 
    }



    require = apr_array_push(dc->aRequirement);

    require->cpExpr = apr_pstrdup(cmd->pool, arg);

    require->cpExpr = arg;

    require->mpExpr = info;



    return NULL;

modules/ssl/ssl_private.h

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ typedef enum { 
 * Define the SSL requirement structure

 */

typedef struct {

    char           *cpExpr;

    const char     *cpExpr;

    ap_expr_info_t *mpExpr;

} ssl_require_t;