You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2017/06/21 12:34:26 UTC
svn commit: r1799431 - /httpd/httpd/trunk/modules/core/mod_watchdog.c
Author: jim
Date: Wed Jun 21 12:34:25 2017
New Revision: 1799431
URL: http://svn.apache.org/viewvc?rev=1799431&view=rev
Log:
Not an error... last one is honored
Modified:
httpd/httpd/trunk/modules/core/mod_watchdog.c
Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=1799431&r1=1799430&r2=1799431&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.c Wed Jun 21 12:34:25 2017
@@ -66,7 +66,6 @@ struct wd_server_conf_t
static wd_server_conf_t *wd_server_conf = NULL;
static apr_interval_time_t wd_interval = AP_WD_TM_INTERVAL;
-static int wd_interval_set = 0;
static int mpm_is_forked = AP_MPMQ_NOT_SUPPORTED;
static const char *wd_proc_mutex_type = "watchdog-callback";
@@ -602,13 +601,10 @@ static const char *wd_cmd_watchdog_int(c
if (errs != NULL)
return errs;
- if (wd_interval_set)
- return "Duplicate WatchdogInterval directives are not allowed";
if ((i = atoi(arg)) < 1)
return "Invalid WatchdogInterval value";
wd_interval = apr_time_from_sec(i);
- wd_interval_set = 1;
return NULL;
}