From: Graham Leggett <minfrin@apache.org>
Date: Tue, 18 Sep 2018 21:45:59 +0000 (+0000)
Subject: mod_proxy_hcheck: Fix issues with interval determination. PR 62318
X-Git-Tag: 2.4.36~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1422c156762d91c3d1ae27eb36c179d88d94d75;p=thirdparty%2Fapache%2Fhttpd.git

mod_proxy_hcheck: Fix issues with interval determination. PR 62318
trunk patch: http://svn.apache.org/r1838937
2.4.x patch: svn merge -c 1838937 ^/httpd/httpd/trunk .
+1: jim, ylavic, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1841266 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 51057f6caa5..756ce9f4672 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.36
 
+  *) mod_proxy_hcheck: Fix issues with interval determination. PR 62318
+     [Jim Jagielski]
+
   *) mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499
      [Dominik Stillhard <dominik.stillhard united-security-providers.ch>]
 
diff --git a/STATUS b/STATUS
index 926e6baadf7..ad76497bbc3 100644
--- a/STATUS
+++ b/STATUS
@@ -124,11 +124,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   *) mod_proxy_hcheck: Fix issues with interval determination. PR 62318
-      trunk patch: http://svn.apache.org/r1838937
-      2.4.x patch: svn merge -c 1838937 ^/httpd/httpd/trunk .
-      +1: jim, ylavic, minfrin
-
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index bf557b71e9c..2783a58e786 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -830,6 +830,7 @@ static void * APR_THREAD_FUNC hc_check(apr_thread_t *thread, void *b)
                  "%sHealth checking %s", (thread ? "Threaded " : ""),
                  worker->s->name);
 
+    worker->s->updated = now;
     if (hc->s->method == TCP) {
         rv = hc_check_tcp(baton);
     }
@@ -870,7 +871,6 @@ static void * APR_THREAD_FUNC hc_check(apr_thread_t *thread, void *b)
             }
         }
     }
-    worker->s->updated = now;
     apr_pool_destroy(baton->ptemp);
     return NULL;
 }