From: Christophe Jaillet Date: Sun, 26 Aug 2018 20:48:39 +0000 (+0000) Subject: Revert r1839247 X-Git-Tag: 2.5.0-alpha2-ci-test-only~2370 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed6afb776a07c99c7284f4e0d865d4c9a582beee;p=thirdparty%2Fapache%2Fhttpd.git Revert r1839247 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1839248 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c index 2057e58f1eb..965fef58992 100644 --- a/modules/cluster/mod_heartmonitor.c +++ b/modules/cluster/mod_heartmonitor.c @@ -310,7 +310,7 @@ static apr_status_t hm_file_update_stat(hm_ctx_t *ctx, hm_server_t *s, apr_pool_ /* Update seen time according to the last file modification */ apr_table_clear(hbt); - qs_to_table(t, hbt, pool); + qs_to_table(apr_pstrdup(pool, t), hbt, pool); if ((val = apr_table_get(hbt, "busy"))) { node.busy = atoi(val); } @@ -624,7 +624,9 @@ static apr_status_t hm_watchdog_callback(int state, void *data, /* store in the slotmem or in the file depending on configuration */ hm_update_stats(ctx, pool); cur = now = apr_time_sec(apr_time_now()); - + /* TODO: Insted HN_UPDATE_SEC use + * the ctx->interval + */ while ((now - cur) < apr_time_sec(ctx->interval)) { int n; apr_status_t rc;