From: Stefan Fritsch <sf@apache.org>
Date: Sat, 23 Oct 2010 18:06:49 +0000 (+0000)
Subject: use temp pool in some more places
X-Git-Tag: 2.3.9~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00cdb469d7104b486a9c2c9be0e045c744dc8a46;p=thirdparty%2Fapache%2Fhttpd.git

use temp pool in some more places


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026657 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/config.c b/server/config.c
index 6508e94278c..a1fb2c9d1ad 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1171,7 +1171,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
      */
     l = apr_palloc(temp_pool, MAX_STRING_LEN);
 
-    bracket = apr_pstrcat(p, orig_directive + 1, ">", NULL);
+    bracket = apr_pstrcat(temp_pool, orig_directive + 1, ">", NULL);
     while (!(ap_cfg_getline(l, MAX_STRING_LEN, parms->config_file))) {
         if (!memcmp(l, "</", 2)
             && (strcasecmp(l + 2, bracket) == 0)
@@ -1490,7 +1490,7 @@ AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
         args = ap_resolve_env(cmd->temp_pool, l);
 #endif
 
-        cmd_name = ap_getword_conf(cmd->pool, &args);
+        cmd_name = ap_getword_conf(cmd->temp_pool, &args);
         if (cmd_name[0] == '<') {
             if (cmd_name[1] == '/') {
                 cmd_name[strlen(cmd_name) - 1] = '\0';
@@ -1530,7 +1530,7 @@ static const char *execute_now(char *cmd_line, const char *args,
 {
     const command_rec *cmd;
     ap_mod_list *ml;
-    char *dir = apr_pstrdup(parms->pool, cmd_line);
+    char *dir = apr_pstrdup(parms->temp_pool, cmd_line);
 
     ap_str_tolower(dir);
 
diff --git a/server/core.c b/server/core.c
index b687e9e7ceb..78cfb2e0294 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1103,7 +1103,7 @@ static const char *set_gprof_dir(cmd_parms *cmd, void *dummy, const char *arg)
         return err;
     }
 
-    conf->gprof_dir = apr_pstrdup(cmd->pool, arg);
+    conf->gprof_dir = arg;
     return NULL;
 }
 #endif /*GPROF*/
@@ -1664,14 +1664,14 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd,
         return unclosed_directive(cmd);
     }
 
-    limited_methods = apr_pstrndup(cmd->pool, arg, endp - arg);
+    limited_methods = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (!limited_methods[0]) {
         return missing_container_arg(cmd);
     }
 
     while (limited_methods[0]) {
-        char *method = ap_getword_conf(cmd->pool, &limited_methods);
+        char *method = ap_getword_conf(cmd->temp_pool, &limited_methods);
         int methnum;
 
         /* check for builtin or module registered method number */
@@ -1684,7 +1684,8 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd,
             /* method has not been registered yet, but resorce restriction
              * is always checked before method handling, so register it.
              */
-            methnum = ap_method_register(cmd->pool, method);
+            methnum = ap_method_register(cmd->pool,
+                                         apr_pstrdup(cmd->pool, method));
         }
 
         limited |= (AP_METHOD_BIT << methnum);
@@ -1746,7 +1747,7 @@ static const char *dirsection(cmd_parms *cmd, void *mconfig, const char *arg)
         return unclosed_directive(cmd);
     }
 
-    arg = apr_pstrndup(cmd->pool, arg, endp - arg);
+    arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (!arg[0]) {
         return missing_container_arg(cmd);
@@ -1842,7 +1843,7 @@ static const char *urlsection(cmd_parms *cmd, void *mconfig, const char *arg)
         return unclosed_directive(cmd);
     }
 
-    arg = apr_pstrndup(cmd->pool, arg, endp - arg);
+    arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (!arg[0]) {
         return missing_container_arg(cmd);
@@ -1912,7 +1913,7 @@ static const char *filesection(cmd_parms *cmd, void *mconfig, const char *arg)
         return unclosed_directive(cmd);
     }
 
-    arg = apr_pstrndup(cmd->pool, arg, endp - arg);
+    arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (!arg[0]) {
         return missing_container_arg(cmd);
@@ -1995,7 +1996,7 @@ static const char *ifsection(cmd_parms *cmd, void *mconfig, const char *arg)
         return unclosed_directive(cmd);
     }
 
-    arg = apr_pstrndup(cmd->pool, arg, endp - arg);
+    arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (!arg[0]) {
         return missing_container_arg(cmd);
@@ -2093,7 +2094,7 @@ static const char *start_ifmod(cmd_parms *cmd, void *mconfig, const char *arg)
         return unclosed_directive(cmd);
     }
 
-    arg = apr_pstrndup(cmd->pool, arg, endp - arg);
+    arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (not) {
         arg++;
@@ -2147,7 +2148,7 @@ static const char *start_ifdefine(cmd_parms *cmd, void *dummy, const char *arg)
         return unclosed_directive(cmd);
     }
 
-    arg = apr_pstrndup(cmd->pool, arg, endp - arg);
+    arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (arg[0] == '!') {
         not = 1;
@@ -2194,7 +2195,7 @@ static const char *virtualhost_section(cmd_parms *cmd, void *dummy,
         return unclosed_directive(cmd);
     }
 
-    arg = apr_pstrndup(cmd->pool, arg, endp - arg);
+    arg = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (!arg[0]) {
         return missing_container_arg(cmd);
@@ -2408,7 +2409,7 @@ static const char *set_server_root(cmd_parms *cmd, void *dummy,
 
     if ((apr_filepath_merge((char**)&ap_server_root, NULL, arg,
                             APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS)
-        || !ap_is_directory(cmd->pool, ap_server_root)) {
+        || !ap_is_directory(cmd->temp_pool, ap_server_root)) {
         return "ServerRoot must be a valid directory";
     }