]> granicus.if.org Git - apache/commitdiff
If disabling health check (NONE) or using TCP method, then
authorJim Jagielski <jim@apache.org>
Tue, 2 Feb 2016 20:49:17 +0000 (20:49 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 2 Feb 2016 20:49:17 +0000 (20:49 +0000)
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

modules/proxy/mod_proxy_balancer.c

index 49b21a863469069627b7d30cd6ebfc3b3f3ae966..22df6d07a094f14dc4ba1f2573ca25d0e8ab2eb6 100644 (file)
@@ -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';