MF 1.3 the fis for the mod_rewrite stupidity.

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

diff --git a/CHANGES b/CHANGES
index 05b67886e48d1c19c03d14d43f1a7a7170fe139e..af073bb88154efacb6209470b6b23b62986a6081 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0b1
 
+  *) Really fix mod_rewrite map lookups this time. [Tony Finch]
+
   *) Get the correct IP address if ServerName isn't set and we can't
      find a fully-qualified domain name at startup.
      PR#7170 [Danek Duvall <dduvall@eng.sun.com>]

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index d7408351aa326fd15b5568dd9b7e963e7cde0322..d9b7fd7834bdfac50db69645b1cde29affa65326 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -2308,11 +2308,11 @@ static void do_expand(request_rec *r, char *input, char *buffer, int nbuf,
                char *map, *key, *dflt, *result;
                char xkey[MAX_STRING_LEN];
                char xdflt[MAX_STRING_LEN];
-               key = find_char_in_brackets(inp, ':', '{', '}');
+               key = find_char_in_brackets(inp+2, ':', '{', '}');
                if (key == NULL)
                    goto skip;
                map  = apr_pstrndup(r->pool, inp+2, key-inp-2);
-               dflt = find_char_in_brackets(inp, '|', '{', '}');
+               dflt = find_char_in_brackets(key+1, '|', '{', '}');
                if (dflt == NULL) {
                    key  = apr_pstrndup(r->pool, key+1, endp-key-1);
                    dflt = "";