httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <traw...@attglobal.net>
Subject Re: cvs commit: httpd-2.0/modules/filters mod_include.c
Date Thu, 23 Aug 2001 11:09:36 GMT
gregames@apache.org writes:

> gregames    01/08/22 16:12:24
> 
>   Modified:    modules/filters mod_include.c
>   Log:
>   get rid of nuisance log messages due to subrequests failing with EPIPE
>   
>   Revision  Changes    Path
>   1.127     +12 -6     httpd-2.0/modules/filters/mod_include.c
>   
>   Index: mod_include.c
>   ===================================================================
>   RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
>   retrieving revision 1.126
>   retrieving revision 1.127
>   diff -u -r1.126 -r1.127
>   --- mod_include.c	2001/08/22 12:07:40	1.126
>   +++ mod_include.c	2001/08/22 23:12:24	1.127
>   @@ -275,7 +275,6 @@
>                    if (ctx->state == PARSE_DIRECTIVE) {
>                        /* gonna start over parsing the directive next time through */
>                        ctx->directive_length = 0;
>   -                    ctx->tag_length       = 0;

WTF...  I thought Paul added this to prevent an overallocation of
storage later on.  Was this an inadvertent delete?

>   @@ -832,8 +832,8 @@
>                        for (p = r; p != NULL && !founddupe; p = p->main) {
>        		    request_rec *q;
>        		    for (q = p; q != NULL; q = q->prev) {
>   -    			if ((q->filename && rr->filename && (strcmp(q->filename,
rr->filename) == 0)) ||
>   -                            (strcmp(q->uri, rr->uri) == 0)) {
>   +    			if ( (strcmp(q->filename, rr->filename) == 0) ||
>   +    			     (strcmp(q->uri, rr->uri) == 0) ){

Gimme my code back :)

Also, you still have a mod_include fix somewhere uncommitted, right?

-- 
Jeff Trawick | trawick@attglobal.net | PGP public key at web site:
       http://www.geocities.com/SiliconValley/Park/9289/
             Born in Roswell... married an alien...

Mime
View raw message