Commit 5a17d3ab authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499 

trunk patch: http://svn.apache.org/r1840582
2.4.x patch: svn merge -c 1840582 ^/httpd/httpd/trunk .
+1: jim, ylavic, minfrin


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ Changes with Apache 2.4.36 


Changes with Apache 2.4.35



  *) mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499

     [Dominik Stillhard <dominik.stillhard united-security-providers.ch>]



  *) mod_proxy_hcheck: take balancer's SSLProxy* directives into account.

     [Jim Jagielski]

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -124,10 +124,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   *) mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499

      trunk patch: http://svn.apache.org/r1840582

      2.4.x patch: svn merge -c 1840582 ^/httpd/httpd/trunk .

      +1: jim, ylavic, minfrin





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/proxy/mod_proxy_hcheck.c

+0 −1
Original line number Diff line number Diff line
@@ -612,7 +612,6 @@ static apr_status_t hc_check_tcp(baton_t *baton) 


    status = hc_get_backend("HCTCP", &backend, hc, ctx, baton->ptemp);

    if (status == OK) {

        backend->addr = hc->cp->addr;

        status = ap_proxy_connect_backend("HCTCP", backend, hc, ctx->s);

        /* does an unconditional ap_proxy_is_socket_connected() */

    }