httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Sun, 24 Feb 2002 00:34:14 GMT
ianh        02/02/23 16:34:14

  Modified:    modules/filters mod_include.c
  Log:
  baby steps
  this fixes the case where we have a SSI start tag split up
  over multiple buckets.
  
  BTW
  HTTPD-test is failing.
  but it was failing on 2.0.32 version of mod-include as well
  
  Submitted by:	Brian Pane
  Reviewed by:	Ian Holsman
  
  Revision  Changes    Path
  1.191     +5 -1      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.190
  retrieving revision 1.191
  diff -u -r1.190 -r1.191
  --- mod_include.c	23 Feb 2002 20:56:35 -0000	1.190
  +++ mod_include.c	24 Feb 2002 00:34:14 -0000	1.191
  @@ -422,7 +422,7 @@
           if (ctx->state == PARSE_HEAD)
           {
               apr_size_t tmpLen;
  -            tmpLen = (len > (slen - 1)) ? len : (slen - 1);
  +            tmpLen = (len < (slen - 1)) ? len : (slen - 1);
   
               while (c < buf + tmpLen && *c == str[ctx->parse_pos])
               {
  @@ -434,6 +434,10 @@
               {
                   ctx->bytes_parsed += c - buf;
                   return found_start_sequence(dptr, ctx, c - buf);
  +            }
  +            else if (c == buf + tmpLen) {
  +                dptr = APR_BUCKET_NEXT(dptr);
  +                continue;
               }
   
               /* False alarm... 
  
  
  

Mime
View raw message