httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r724092 - in /httpd/httpd/trunk/modules/cluster: mod_heartbeat.c mod_heartmonitor.c
Date Sun, 07 Dec 2008 06:23:04 GMT
Author: pquerna
Date: Sat Dec  6 22:23:04 2008
New Revision: 724092

URL: http://svn.apache.org/viewvc?rev=724092&view=rev
Log:
Use cmd->temp_pool for temp allocations during configuration.
Suggested by: Takashi Sato <takashi lans-tv.com>

Modified:
    httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
    httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c

Modified: httpd/httpd/trunk/modules/cluster/mod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartbeat.c?rev=724092&r1=724091&r2=724092&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartbeat.c Sat Dec  6 22:23:04 2008
@@ -308,7 +308,7 @@
         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 @@
         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.";

Modified: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c?rev=724092&r1=724091&r2=724092&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c Sat Dec  6 22:23:04 2008
@@ -541,7 +541,7 @@
         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.";



Mime
View raw message