Commit 2e9aafea authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Merge r1657692, r1660800 from trunk 

   * Save a few bytes in conf pool when parsing some directives. Use temp_pool
     when applicable.

Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, covener
Backported by: jailletc36

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

STATUS

+0 −7
Changes for STATUS: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -112,13 +112,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunk works (module CHANGES)

     +1: ylavic, wrowe, minfrin



   * Save a few bytes in conf pool when parsing some directives. Use temp_pool

     when applicable.

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

                  http://svn.apache.org/r1660800

     2.4.x patch: trunk works

     +1: jailletc36, ylavic, covener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

modules/filters/mod_filter.c

+1 −1
Changes for modules/filters/mod_filter.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static const char *filter_protocol(cmd_parms *cmd, void *CFG, const char *fname, 
    }



    /* Now set flags from our args */

    for (arg = apr_strtok(apr_pstrdup(cmd->pool, proto), sep, &tok);

    for (arg = apr_strtok(apr_pstrdup(cmd->temp_pool, proto), sep, &tok);

         arg; arg = apr_strtok(NULL, sep, &tok)) {



        if (!strcasecmp(arg, "change=yes")) {

os/unix/unixd.c

+2 −2
Changes for os/unix/unixd.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, 
        return;

    }



    if (*(str = ap_getword_conf(cmd->pool, &arg)) != '\0') {

    if (*(str = ap_getword_conf(cmd->temp_pool, &arg)) != '\0') {

        if (!strcasecmp(str, "max")) {

            cur = limit->rlim_max;

        }
@@ -88,7 +88,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, 
        return;

    }



    if (arg2 && (*(str = ap_getword_conf(cmd->pool, &arg2)) != '\0')) {

    if (arg2 && (*(str = ap_getword_conf(cmd->temp_pool, &arg2)) != '\0')) {

        max = atol(str);

    }

server/config.c

+5 −1
Changes for server/config.c: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1016,7 +1016,11 @@ static const char *invoke_cmd(const command_rec *cmd, cmd_parms *parms, 
        return errmsg;



    case FLAG:

        w = ap_getword_conf(parms->pool, &args);

        /*

         * This is safe to use temp_pool here, because the 'flag' itself is not

         * forwarded as-is

         */

        w = ap_getword_conf(parms->temp_pool, &args);



        if (*w == '\0' || (strcasecmp(w, "on") && strcasecmp(w, "off")))

            return apr_pstrcat(parms->pool, cmd->name, " must be On or Off",

server/mpm_common.c

+1 −1
Changes for server/mpm_common.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ const char *ap_mpm_set_coredumpdir(cmd_parms *cmd, void *dummy, 
        return err;

    }



    fname = ap_server_root_relative(cmd->pool, arg);

    fname = ap_server_root_relative(cmd->temp_pool, arg);

    if (!fname) {

        return apr_pstrcat(cmd->pool, "Invalid CoreDumpDirectory path ",

                           arg, NULL);