You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fa...@apache.org on 2001/02/01 11:03:45 UTC
cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
fanf 01/02/01 02:03:44
Modified: . CHANGES
modules/mappers mod_rewrite.c
Log:
MF 1.3 the fis for the mod_rewrite stupidity.
Revision Changes Path
1.69 +2 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -u -r1.68 -r1.69
--- CHANGES 2001/02/01 09:59:22 1.68
+++ CHANGES 2001/02/01 10:03:38 1.69
@@ -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 <dd...@eng.sun.com>]
1.66 +2 -2 httpd-2.0/modules/mappers/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -u -r1.65 -r1.66
--- mod_rewrite.c 2001/01/31 23:11:00 1.65
+++ mod_rewrite.c 2001/02/01 10:03:42 1.66
@@ -2308,11 +2308,11 @@
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 = "";