You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2015/02/27 07:05:12 UTC

svn commit: r1662639 - in /httpd/httpd/branches/2.4.x: STATUS modules/filters/mod_filter.c os/unix/unixd.c server/config.c server/mpm_common.c

Author: jailletc36
Date: Fri Feb 27 06:05:11 2015
New Revision: 1662639

URL: http://svn.apache.org/r1662639
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c
    httpd/httpd/branches/2.4.x/os/unix/unixd.c
    httpd/httpd/branches/2.4.x/server/config.c
    httpd/httpd/branches/2.4.x/server/mpm_common.c

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1662639&r1=1662638&r2=1662639&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Feb 27 06:05:11 2015
@@ -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 ]
 

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c?rev=1662639&r1=1662638&r2=1662639&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_filter.c Fri Feb 27 06:05:11 2015
@@ -362,7 +362,7 @@ static const char *filter_protocol(cmd_p
     }
 
     /* 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")) {

Modified: httpd/httpd/branches/2.4.x/os/unix/unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/os/unix/unixd.c?rev=1662639&r1=1662638&r2=1662639&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/os/unix/unixd.c (original)
+++ httpd/httpd/branches/2.4.x/os/unix/unixd.c Fri Feb 27 06:05:11 2015
@@ -74,7 +74,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd
         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
         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);
     }
 

Modified: httpd/httpd/branches/2.4.x/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/config.c?rev=1662639&r1=1662638&r2=1662639&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/config.c (original)
+++ httpd/httpd/branches/2.4.x/server/config.c Fri Feb 27 06:05:11 2015
@@ -1016,7 +1016,11 @@ static const char *invoke_cmd(const comm
         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",

Modified: httpd/httpd/branches/2.4.x/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm_common.c?rev=1662639&r1=1662638&r2=1662639&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm_common.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm_common.c Fri Feb 27 06:05:11 2015
@@ -343,7 +343,7 @@ const char *ap_mpm_set_coredumpdir(cmd_p
         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);