Commit 66dd7d83 authored by Paul Querna's avatar Paul Querna
Browse files

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
parent 082484fe

modules/cluster/mod_heartbeat.c

+4 −4
Original line number Diff line number Diff line
@@ -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.";

modules/cluster/mod_heartmonitor.c

+1 −1
Original line number Diff line number Diff line
@@ -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.";