]> granicus.if.org Git - apache/commitdiff
Adjust
authorJim Jagielski <jim@apache.org>
Thu, 21 Jan 2016 18:33:52 +0000 (18:33 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 21 Jan 2016 18:33:52 +0000 (18:33 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726052 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/mod_proxy_hcheck.c

index aa6559a688da787b97402cf3b15f03f784cebeb6..fa43ba14ef686d42c6d8d8c478a8db0e82a25cc5 100644 (file)
@@ -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;