Commit 27f60f11 authored by Graham Leggett's avatar Graham Leggett
Browse files

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
parent 5032740e

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- 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>]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -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:

modules/proxy/mod_proxy_hcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}