Return-Path: Delivered-To: apmail-new-httpd-archive@apache.org Received: (qmail 54532 invoked by uid 500); 19 Jan 2001 00:57:37 -0000 Mailing-List: contact new-httpd-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list new-httpd@apache.org Received: (qmail 54521 invoked from network); 19 Jan 2001 00:57:37 -0000 From: Jim Jagielski Message-Id: <200101190057.TAA29006@devsys.jaguNET.com> Subject: Re: cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h To: new-httpd@apache.org Date: Thu, 18 Jan 2001 19:57:41 -0500 (EST) Reply-To: jim@jaguNET.com In-Reply-To: <20010118222838.99774.qmail@apache.org> from "fanf@apache.org" at Jan 18, 2001 10:28:38 PM X-Mailer: ELM [version 2.5 PL2] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N 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."