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)

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

diff --git a/CHANGES b/CHANGES
index e45c5e4108a486af0c654d121154c245839e04a8..1487c68b87c044b69f07e11d00fc3508d2f62365 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) 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]
+
   *) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
      5+ instead of just for FreeBSD 5. PR 53824. [Jeff Trawick]
 

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 16e4a429e66cdafd2aa1d5ba5d3a20c9ac243dde..db033a12f4edf88ce4ee7073ad522a408dfb0239 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2225,17 +2225,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,