From: Jim Jagielski <jim@apache.org>
Date: Wed, 21 Jun 2017 12:34:25 +0000 (+0000)
Subject: Not an error... last one is honored
X-Git-Tag: 2.5.0-alpha~362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3a8efb9d060c012bd6199bfb154c0f6a85256a2;p=thirdparty%2Fapache%2Fhttpd.git

Not an error... last one is honored


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

diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c
index 9f10c0d7181..c4f98570008 100644
--- a/modules/core/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
@@ -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(cmd_parms *cmd, void *dummy,
 
     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;
 }