From: Jim Jagielski <jim@apache.org>
Date: Wed, 21 Jun 2017 16:24:00 +0000 (+0000)
Subject: allow balancer-manager to also accept subsecond intervals
X-Git-Tag: 2.5.0-alpha~346
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1c3e06c4aafbe3f33bc295dbcdd77df65baaccb;p=thirdparty%2Fapache%2Fhttpd.git

allow balancer-manager to also accept subsecond intervals


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

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 12913533bd6..52279fbe561 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -22,6 +22,7 @@
 #include "apr_version.h"
 #include "ap_hooks.h"
 #include "apr_date.h"
+#include "mod_watchdog.h"
 
 static const char *balancer_mutex_type = "proxy-balancer-shm";
 ap_slotmem_provider_t *storage = NULL;
@@ -1140,10 +1141,12 @@ static int balancer_handler(request_rec *r)
              }
         }
         if ((val = apr_table_get(params, "w_hi"))) {
-            int ival = atoi(val);
-            if (ival >= HCHECK_WATHCHDOG_INTERVAL) {
-                wsel->s->interval = apr_time_from_sec(ival);
-             }
+            apr_interval_time_t hci;
+            if (ap_timeout_parameter_parse(val, &hci, "s") == APR_SUCCESS) {
+                if (hci >= AP_WD_TM_SLICE) {
+                    wsel->s->interval = hci;
+                }
+            }
         }
         if ((val = apr_table_get(params, "w_hp"))) {
             int ival = atoi(val);