svn commit: r1657692 - in /httpd/httpd/trunk: modules/filters/mod_filter.c os/unix/unixd.c server/mpm_common.c

[ja...@apache.org]

Author: jailletc36
Date: Thu Feb  5 21:03:04 2015
New Revision: 1657692

URL: http://svn.apache.org/r1657692
Log:
Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable.

Modified:
    httpd/httpd/trunk/modules/filters/mod_filter.c
    httpd/httpd/trunk/os/unix/unixd.c
    httpd/httpd/trunk/server/mpm_common.c

Modified: httpd/httpd/trunk/modules/filters/mod_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_filter.c?rev=1657692&r1=1657691&r2=1657692&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_filter.c Thu Feb  5 21:03:04 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/trunk/os/unix/unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.c?rev=1657692&r1=1657691&r2=1657692&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.c (original)
+++ httpd/httpd/trunk/os/unix/unixd.c Thu Feb  5 21:03:04 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/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1657692&r1=1657691&r2=1657692&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Thu Feb  5 21:03:04 2015
@@ -360,7 +360,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);