From: Jean-Frederic Clere <jfclere@apache.org>
Date: Thu, 4 Jun 2020 08:40:10 +0000 (+0000)
Subject: make sure the $n of the regular expressions is not included the name of the worker.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1402
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d3db8bb051ca9f6223142dcb798ebd21db5f08c;p=thirdparty%2Fapache%2Fhttpd.git

make sure the $n of the regular expressions is not included the name of the worker.
for example,  the example:
ProxyPassMatch "^(/.*\.gif)$" "http://backend.example.com:8000$1"
was giving:
AH00526: Syntax error on line nnn of bla/conf/httpd.conf:
ProxyPass Unable to parse URL: http://backend.example.com:8000$1



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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index c0c19110b9b..1597b9f211b 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1951,8 +1951,12 @@ PROXY_DECLARE(char *) ap_proxy_define_match_worker(apr_pool_t *p,
                                              int do_malloc)
 {
     char *err;
+    char *rurl = apr_pstrdup(p, url);
+    char *pdollar = ap_strchr(rurl, '$');
 
-    err = ap_proxy_define_worker(p, worker, balancer, conf, url, do_malloc);
+    if (pdollar != NULL)
+        *pdollar = '\0'; 
+    err = ap_proxy_define_worker(p, worker, balancer, conf, rurl, do_malloc);
     if (err) {
         return err;
     }