From: Paul Querna <pquerna@apache.org>
Date: Sun, 7 Dec 2008 06:23:04 +0000 (+0000)
Subject: Use cmd->temp_pool for temp allocations during configuration.
X-Git-Tag: 2.3.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a0ac63f297e7676a143dd0f9b03e3b7d1e5683f;p=thirdparty%2Fapache%2Fhttpd.git

Use cmd->temp_pool for temp allocations during configuration.
Suggested by: Takashi Sato <takashi lans-tv.com>


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

diff --git a/modules/cluster/mod_heartbeat.c b/modules/cluster/mod_heartbeat.c
index 1f978db6457..c2562db17b1 100644
--- a/modules/cluster/mod_heartbeat.c
+++ b/modules/cluster/mod_heartbeat.c
@@ -308,7 +308,7 @@ static const char *cmd_hb_address(cmd_parms *cmd,
         return "HeartbeatAddress: May only be specified once.";
     }
 
-    rv = apr_parse_addr_port(&host_str, &scope_id, &port, addr, p);
+    rv = apr_parse_addr_port(&host_str, &scope_id, &port, addr, cmd->temp_pool);
 
     if (rv) {
         return "HeartbeatAddress: Unable to parse address.";
@@ -329,14 +329,14 @@ static const char *cmd_hb_address(cmd_parms *cmd,
         return "HeartbeatAddress: apr_sockaddr_info_get failed.";
     }
 
-    rv = apr_temp_dir_get(&tmpdir, p);
+    rv = apr_temp_dir_get(&tmpdir, cmd->temp_pool);
     if (rv) {
         return "HeartbeatAddress: unable to find temp directory.";
     }
 
-    path = apr_pstrcat(p, tmpdir, "/hb-tmp.XXXXXX", NULL);
+    path = apr_pstrcat(cmd->temp_pool, tmpdir, "/hb-tmp.XXXXXX", NULL);
 
-    rv = apr_file_mktemp(&ctx->lockf, path, 0, p);
+    rv = apr_file_mktemp(&ctx->lockf, path, 0, cmd->temp_pool);
 
     if (rv) {
         return "HeartbeatAddress: unable to allocate temp file.";
diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index d54d6e9ca47..77552587a8a 100644
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -541,7 +541,7 @@ static const char *cmd_hm_listen(cmd_parms *cmd,
         return "HeartbeatListen: May only be specified once.";
     }
 
-    rv = apr_parse_addr_port(&host_str, &scope_id, &port, mcast_addr, p);
+    rv = apr_parse_addr_port(&host_str, &scope_id, &port, mcast_addr, cmd->temp_pool);
 
     if (rv) {
         return "HeartbeatListen: Unable to parse multicast address.";