From: Jim Jagielski <jim@apache.org>
Date: Sun, 5 Jan 2014 16:15:08 +0000 (+0000)
Subject: Merge r1552227 from trunk:
X-Git-Tag: 2.4.8~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=823fb7ec4a7815faf70bfe42855112fb227b29bd;p=apache

Merge r1552227 from trunk:

Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555552 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index dd980233f2..a295dd5ae4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,13 @@
 
 Changes with Apache 2.4.8
 
+  *) mod_proxy: Remove <Proxy ~ wildcard-url> syntax which:
+      - is equivalent to <ProxyMatch wildcard-url>
+      - has never been documented
+      - incorrectly checks parameters
+      - is buggy
+     [Christophe Jaillet]
+
   *) mod_authz_user: Support the expression parser within the require
      directives. [Graham Leggett]
 
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index f2f3a8de74..15ba32a379 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2231,17 +2231,6 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg)
             return "Regex could not be compiled";
         }
     }
-    else if (!strcmp(cmd->path, "~")) {
-        cmd->path = ap_getword_conf(cmd->pool, &arg);
-        if (!cmd->path)
-            return "<Proxy ~ > block must specify a path";
-        if (strncasecmp(cmd->path, "proxy:", 6))
-            cmd->path += 6;
-        r = ap_pregcomp(cmd->pool, cmd->path, AP_REG_EXTENDED);
-        if (!r) {
-            return "Regex could not be compiled";
-        }
-    }
 
     /* initialize our config and fetch it */
     conf = ap_set_config_vectors(cmd->server, new_dir_conf, cmd->path,