From: Jean-Frederic Clere <jfclere@apache.org>
Date: Tue, 7 Apr 2009 12:10:57 +0000 (+0000)
Subject: Set keep_running and clean pool if not.
X-Git-Tag: 2.3.3~732
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27ce291f0c57144f95b1b66d3790b404b1bf29b9;p=thirdparty%2Fapache%2Fhttpd.git

Set keep_running and clean pool if not.


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

diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 78b391ad39b..fd6667184b4 100644
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -317,6 +317,7 @@ static apr_status_t hm_watchdog_callback(int state, void *data,
                              "Heartmonitor: Unable to listen for connections!");
             }
             else {
+                ctx->keep_running = -1;
                 ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s,
                              "Heartmonitor: %s listener started.",
                              HM_WATHCHDOG_NAME);
@@ -347,6 +348,7 @@ static apr_status_t hm_watchdog_callback(int state, void *data,
                 rc = apr_poll(&pfd, 1, &n, timeout);
 
                 if (!ctx->keep_running) {
+                    apr_pool_destroy(p);
                     break;
                 }
                 if (rc == APR_SUCCESS && (pfd.rtnevents & APR_POLLIN)) {