You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jim Jagielski <ji...@jaguNET.com> on 2001/01/19 01:57:41 UTC

Re: cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h

The RM is somewhat concerned... Code freeze in effect, remember? :)

(No, not about *this* commit :) )

fanf@apache.org wrote:
> 
> fanf        01/01/18 14:28:37
> 
>   Modified:    src/modules/standard mod_rewrite.c mod_rewrite.h
>   Log:
>   Fix the previous commit (rev. 1.168 of mod_rewrite.c) which was grievously
>   broken regarding the declaration and calling of find_char_in_brackets().
>   I shouldn't try to do things like this so late at night...
>   
>   Revision  Changes    Path
>   1.169     +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.168
>   retrieving revision 1.169
>   diff -u -u -r1.168 -r1.169
>   --- mod_rewrite.c	2001/01/18 14:00:22	1.168
>   +++ mod_rewrite.c	2001/01/18 22:28:34	1.169
>   @@ -2287,11 +2287,11 @@
>    		char *map, *key, *dflt, *result;
>    		char xkey[MAX_STRING_LEN];
>    		char xdflt[MAX_STRING_LEN];
>   -		key = find_char_in_brackts(inp, ':', '{', '}');
>   +		key = find_char_in_brackets(inp, ':', '{', '}');
>    		if (key == NULL)
>    		    goto skip;
>    		map  = ap_pstrndup(r->pool, inp+2, key-inp-2);
>   -		dflt = find_char_in_brackts(inp, '|', '{', '}');
>   +		dflt = find_char_in_brackets(inp, '|', '{', '}');
>    		if (dflt == NULL) {
>    		    key  = ap_pstrndup(r->pool, key+1, endp-key-1);
>    		    dflt = "";
>   
>   
>   
>   1.77      +1 -0      apache-1.3/src/modules/standard/mod_rewrite.h
>   
>   Index: mod_rewrite.h
>   ===================================================================
>   RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
>   retrieving revision 1.76
>   retrieving revision 1.77
>   diff -u -u -r1.76 -r1.77
>   --- mod_rewrite.h	2001/01/15 17:05:48	1.76
>   +++ mod_rewrite.h	2001/01/18 22:28:35	1.77
>   @@ -499,6 +499,7 @@
>    
>        /* Find end of bracketed expression */
>    static char *find_closing_bracket(char *s, int left, int right);
>   +static char *find_char_in_brackets(char *s, int c, int left, int right);
>    
>    #endif /* _MOD_REWRITE_H */
>    
>   
>   
>   
> 


-- 
===========================================================================
   Jim Jagielski   [|]   jim@jaguNET.com   [|]   http://www.jaguNET.com/
          "Casanova will have many weapons; To beat him you will
              have to have more than forks and flatulence."

Re: cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h

Posted by Tony Finch <do...@dotat.at>.
Jim Jagielski <ji...@jaguNET.com> wrote:
>The RM is somewhat concerned... Code freeze in effect, remember? :)

Sorry, I should have asked before committing, but it was worth fixing...

Tony.
-- 
f.a.n.finch    fanf@covalent.net    dot@dotat.at
"You realize there's a government directive stating
that there is no such thing as a flying saucer?"

RE: cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
> From: Jim Jagielski [mailto:jim@jaguNET.com]
> Sent: Thursday, January 18, 2001 6:58 PM
> 
> The RM is somewhat concerned... Code freeze in effect, remember? :)
> 
> (No, not about *this* commit :) )

Any rewrite/byterange/win32 console problems, given their instability
between 1.3.12 and 1.3.14, are fair game if they make the code stronger.

I'm for keeping to the release date come heck or large puddles.  But 
I'd suggest the bug fixes Tony is choosing are wise (the hour he 
chooses to apply them, however... :0)