From: Graham Leggett <minfrin@apache.org>
Date: Tue, 18 Sep 2018 21:24:06 +0000 (+0000)
Subject: mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499
X-Git-Tag: 2.4.36~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=211d13e97caf526119cae6d0296400c55163b75f;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/CHANGES b/CHANGES
index 7443f4d5ecf..90547fc4455 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/STATUS b/STATUS
index 80750cc1ed9..06bc1acd0af 100644
--- a/STATUS
+++ b/STATUS
@@ -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:
diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 0ee68452650..bf557b71e9c 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -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() */
     }