svn commit: r1552227 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c

[ja...@apache.org]

Author: jailletc36
Date: Thu Dec 19 04:53:15 2013
New Revision: 1552227

URL: http://svn.apache.org/r1552227
Log:
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)

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1552227&r1=1552226&r2=1552227&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Dec 19 04:53:15 2013
@@ -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]
 

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1552227&r1=1552226&r2=1552227&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Dec 19 04:53:15 2013
@@ -2225,17 +2225,6 @@ static const char *proxysection(cmd_parm
             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,