httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Wed, 24 Mar 2004 19:57:06 GMT
stoddard    2004/03/24 11:57:06

  Modified:    .        CHANGES
               server   core.c
  Log:
  Can't assume the filepointer is really 0 when offset is 0. A handler can create brigades
containing multiple file buckets with arbitrary offsets
  
  Revision  Changes    Path
  1.1434    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1433
  retrieving revision 1.1434
  diff -u -r1.1433 -r1.1434
  --- CHANGES	24 Mar 2004 02:53:34 -0000	1.1433
  +++ CHANGES	24 Mar 2004 19:57:05 -0000	1.1434
  @@ -1,6 +1,10 @@
   Changes with Apache 2.1.0-dev
   
     [Remove entries to the current 2.0 section below, when backported]
  +  *) core_output_filter: Fix bug that could result in sending
  +     garbage over the network when module handlers construct
  +     bucket brigades containing multiple file buckets all referencing
  +     the same open file descriptor. [Bojan Smojver]
   
     *) Fix memory corruption problem with ap_custom_response() function.
        The core per-dir config would later point to request pool data
  
  
  
  1.269     +1 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.268
  retrieving revision 1.269
  diff -u -r1.268 -r1.269
  --- core.c	24 Mar 2004 02:53:35 -0000	1.268
  +++ core.c	24 Mar 2004 19:57:06 -0000	1.269
  @@ -2995,7 +2995,7 @@
       }
   
       /* Seek the file to 'offset' */
  -    if (offset != 0 && rv == APR_SUCCESS) {
  +    if (offset >= 0 && rv == APR_SUCCESS) {
           rv = apr_file_seek(fd, APR_SET, &offset);
       }
   
  
  
  

Mime
View raw message