httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
Date Thu, 01 Feb 2001 04:12:27 GMT
fanf        01/01/31 20:12:27

  Modified:    src      CHANGES
               src/modules/standard mod_rewrite.c
  Log:
  WTF did I think I was doing? Pass the correct string pointers to
  find_char_in_brackets().
  Reported by: Carsten Gaebler <cg@schlund.de>
  
  Revision  Changes    Path
  1.1632    +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1631
  retrieving revision 1.1632
  diff -u -u -r1.1631 -r1.1632
  --- CHANGES	2001/01/31 21:52:07	1.1631
  +++ CHANGES	2001/02/01 04:12:25	1.1632
  @@ -1,5 +1,7 @@
   Changes with Apache 1.3.18
   
  +  *) Really fix mod_rewrite map lookups this time. [Tony Finch]
  +
     *) Fixed a problem with file extensions being truncated during
        the call to ap_os_canonical_filename().
   	 [Brad Nicholes <BNICHOLES@novell.com>]
  
  
  
  1.170     +2 -2      apache-1.3/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.169
  retrieving revision 1.170
  diff -u -u -r1.169 -r1.170
  --- mod_rewrite.c	2001/01/18 22:28:34	1.169
  +++ mod_rewrite.c	2001/02/01 04:12:26	1.170
  @@ -2287,11 +2287,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  = ap_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  = ap_pstrndup(r->pool, key+1, endp-key-1);
   		    dflt = "";
  
  
  

Mime
View raw message