Commit 6717de5c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1715273 from trunk: 

Save a few bytes in conf pool.
Submitted by: jailletc36
Reviewed/backported by: jim


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

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -112,11 +112,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]





  *) mod_ssl: Save a few bytes in conf pool.

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

     2.4.x patch: trunk patches work

     +1: jailletc36, ylavic, jim





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

modules/ssl/ssl_engine_config.c

+2 −4
Original line number Diff line number Diff line
@@ -832,8 +832,7 @@ const char *ssl_cmd_SSLCertificateFile(cmd_parms *cmd, 
        return err;

    }



    *(const char **)apr_array_push(sc->server->pks->cert_files) =

        apr_pstrdup(cmd->pool, arg);

    *(const char **)apr_array_push(sc->server->pks->cert_files) = arg;

    

    return NULL;

}
@@ -849,8 +848,7 @@ const char *ssl_cmd_SSLCertificateKeyFile(cmd_parms *cmd, 
        return err;

    }



    *(const char **)apr_array_push(sc->server->pks->key_files) =

        apr_pstrdup(cmd->pool, arg);

    *(const char **)apr_array_push(sc->server->pks->key_files) = arg;



    return NULL;

}