From: Jim Jagielski <jim@apache.org>
Date: Tue, 2 Feb 2016 20:49:17 +0000 (+0000)
Subject: If disabling health check (NONE) or using TCP method, then
X-Git-Tag: 2.5.0-alpha~2217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89058e7b74263641f1391c0722864386bdef094c;p=thirdparty%2Fapache%2Fhttpd.git

If disabling health check (NONE) or using TCP method, then
the expression is moot and is nulled out

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

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 49b21a86346..22df6d07a09 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1165,7 +1165,8 @@ static int balancer_handler(request_rec *r)
                 *wsel->s->hcuri = '\0';
         }
         if (hc_valid_expr_f && (val = apr_table_get(params, "w_he"))) {
-            if (strlen(val) && hc_valid_expr_f(r, val) && strlen(val) < sizeof(wsel->s->hcexpr))
+            if (strlen(val) && wsel->s->method != NONE && wsel->s->method != TCP &&
+                    hc_valid_expr_f(r, val) && strlen(val) < sizeof(wsel->s->hcexpr))
                 strcpy(wsel->s->hcexpr, val);
             else
                 *wsel->s->hcexpr = '\0';