httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bill Stoddard" <b...@wstoddard.com>
Subject Re: [PATCH] mod_include fix (only show stopper in 2.0.24...)
Date Fri, 17 Aug 2001 17:06:15 GMT
Have we rolled 2.0.24 yet? I think this was the last showstopper. 

+1 on committing, push the tag and roll.

Bill

----- Original Message ----- 
From: "Jeff Trawick" <trawick@attglobal.net>
To: <new-httpd@apache.org>
Sent: Friday, August 17, 2001 11:19 AM
Subject: [PATCH] mod_include fix


> In the "2.0.24 tagged" thread, Greg mentioned a problem with
> mod_include.  This fixes it for me.
> 
> We're in find_end_sequence() walking over the directive and the rest
> of the tag but we stop parsing so we don't walk over too much storage
> (e.g., mmap) at once).  When we resume later, ctx->directive_length
> has the value it had when we bailed out, so directive_length is wrong
> and we hit errors like:
> 
> [Fri Aug 17 11:12:06 2001] [error] [client 127.0.0.1] unknown directiv
> e "include virt" in parsed doc /home/trawick/apacheinst/htdocs/manual/
> mod/mod_include.html
> 
> If anyone else is hitting similar problems, please try this patch.
> 
> Index: modules/filters/mod_include.c
> ===================================================================
> RCS file: /home/cvspublic/httpd-2.0/modules/filters/mod_include.c,v
> retrieving revision 1.121
> diff -u -r1.121 mod_include.c
> --- modules/filters/mod_include.c 2001/08/11 04:04:12 1.121
> +++ modules/filters/mod_include.c 2001/08/17 15:09:26
> @@ -270,6 +270,8 @@
>          }
>          while (c < buf + len) {
>              if (ctx->bytes_parsed >= BYTE_COUNT_THRESHOLD) {
> +                /* gonna start over parsing the directive next time through */
> +                ctx->directive_length = 0;
>                  return dptr;
>              }
>  
> 
> -- 
> 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