httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.c
Date Fri, 18 Jan 2002 21:38:12 GMT
trawick     02/01/18 13:38:12

  Modified:    .        CHANGES
               modules/filters mod_include.c
  Log:
  Fix a segfault in mod_include which was found by Sander Striker using
  an APR_POOL_DEBUG/ElectricFence build.
  
  Revision  Changes    Path
  1.527     +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.526
  retrieving revision 1.527
  diff -u -r1.526 -r1.527
  --- CHANGES	18 Jan 2002 21:35:22 -0000	1.526
  +++ CHANGES	18 Jan 2002 21:38:11 -0000	1.527
  @@ -1,5 +1,7 @@
   Changes with Apache 2.0.31-dev
   
  +  *) Fix a segfault in mod_include.  [Justin Erenkrantz, Jeff Trawick]
  +
     *) Cause Win32 to capture all child-worker process errors in
        Apache to the main server error log, until the child can
        open its own error logs.  [William Rowe]
  
  
  
  1.187     +2 -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.186
  retrieving revision 1.187
  diff -u -r1.186 -r1.187
  --- mod_include.c	13 Jan 2002 06:34:10 -0000	1.186
  +++ mod_include.c	18 Jan 2002 21:38:12 -0000	1.187
  @@ -3063,7 +3063,8 @@
       }
   
       /* We have nothing more to send, stop now. */
  -    if (APR_BUCKET_IS_EOS(dptr)) {
  +    if (dptr != APR_BRIGADE_SENTINEL(*bb) &&
  +        APR_BUCKET_IS_EOS(dptr)) {
           /* We might have something saved that we never completed, but send
            * down unparsed.  This allows for <!-- at the end of files to be
            * sent correctly. */
  
  
  

Mime
View raw message