From: Jim Jagielski <jim@apache.org>
Date: Thu, 21 Jan 2016 18:33:52 +0000 (+0000)
Subject: Adjust
X-Git-Tag: 2.5.0-alpha~2323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=163a04ce8becfbbbd5f2cf7ad5ed0be9314e250f;p=thirdparty%2Fapache%2Fhttpd.git

Adjust

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

diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index aa6559a688d..fa43ba14ef6 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -987,7 +987,11 @@ static int hc_expr_lookup(ap_expr_lookup_parms *parms)
          */
         if (strcasecmp(parms->name, "HC") == 0) {
             *parms->func = hc_expr_func_fn;
+<<<<<<< ed5428fb47013d766021b6e21a354a1f66502635
             *parms->data = parms->name;
+=======
+            *parms->data = parms->arg;
+>>>>>>> Adjust to pass arg
             return OK;
         }
         break;