You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jf...@apache.org on 2009/04/07 14:10:58 UTC

svn commit: r762730 - /httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c

Author: jfclere
Date: Tue Apr  7 12:10:57 2009
New Revision: 762730

URL: http://svn.apache.org/viewvc?rev=762730&view=rev
Log:
Set keep_running and clean pool if not.

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

Modified: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c?rev=762730&r1=762729&r2=762730&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c Tue Apr  7 12:10:57 2009
@@ -317,6 +317,7 @@
                              "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 @@
                 rc = apr_poll(&pfd, 1, &n, timeout);
 
                 if (!ctx->keep_running) {
+                    apr_pool_destroy(p);
                     break;
                 }
                 if (rc == APR_SUCCESS && (pfd.rtnevents & APR_POLLIN)) {



Re: svn commit: r762730 - /httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c

Posted by Ruediger Pluem <rp...@apache.org>.

On 04/07/2009 02:10 PM, jfclere@apache.org wrote:
> Author: jfclere
> Date: Tue Apr  7 12:10:57 2009
> New Revision: 762730
> 
> URL: http://svn.apache.org/viewvc?rev=762730&view=rev
> Log:
> Set keep_running and clean pool if not.
> 
> Modified:
>     httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
> 
> Modified: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c?rev=762730&r1=762729&r2=762730&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (original)
> +++ httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c Tue Apr  7 12:10:57 2009
> @@ -317,6 +317,7 @@
>                               "Heartmonitor: Unable to listen for connections!");
>              }
>              else {
> +                ctx->keep_running = -1;

Why -1 and not 1?

Regards

RĂ¼diger