httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Tue, 01 Jul 2003 00:13:35 GMT
striker     2003/06/30 17:13:34

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS CHANGES
               server   Tag: APACHE_2_0_BRANCH core.c
  Log:
  Backport from 2.1:
  
  core_output_filter: don't split the brigade after a FLUSH bucket if
  it's the last bucket.  This prevents creating unneccessary empty
  brigades which may not be destroyed until the end of a keepalive
  connection.
  
  Submitted by: Juan Rivera <Juan.Rivera@citrix.com>
  Reviewed by: Brian Pane, Jeff Trawick, Justin Erenkrantz, Sander Striker
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.349 +1 -9      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.348
  retrieving revision 1.751.2.349
  diff -u -r1.751.2.348 -r1.751.2.349
  --- STATUS	29 Jun 2003 17:59:27 -0000	1.751.2.348
  +++ STATUS	1 Jul 2003 00:13:28 -0000	1.751.2.349
  @@ -70,14 +70,6 @@
         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c.diff?r1=1.131&r2=1.132&diff_format=h
         +1: brianp, jerenkrantz
   
  -    * core_output_filter: don't split the brigade after a FLUSH bucket
  -      if it's the last bucket.  This prevents creating unneccessary empty
  -      brigades which may not be destroyed until the end of a keepalive
  -      connection.
  -      server/core.c: r1.238
  -      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c.diff?r1=1.237&r2=1.238
  -      +1: brianp, trawick, jerenkrantz
  -
       * Backport LimitInteralRecursion to 2.0 and 1.3.
         (1.3 patch is here: <http://cvs.apache.org/~nd/recursion13.patch>)
         (2.0 patch is here: <http://cvs.apache.org/~nd/recursion20.patch>)
  
  
  
  1.988.2.120 +9 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.119
  retrieving revision 1.988.2.120
  diff -u -r1.988.2.119 -r1.988.2.120
  --- CHANGES	23 Jun 2003 12:28:23 -0000	1.988.2.119
  +++ CHANGES	1 Jul 2003 00:13:29 -0000	1.988.2.120
  @@ -1,5 +1,14 @@
   Changes with Apache 2.0.47
   
  +  *) core_output_filter: don't split the brigade after a FLUSH bucket if
  +     it's the last bucket.  This prevents creating unneccessary empty
  +     brigades which may not be destroyed until the end of a keepalive
  +     connection.
  +     [Juan Rivera <Juan.Rivera@citrix.com>]
  +
  +  *) Add support for "streamy" PROPFIND responses.
  +     [Ben Collins-Sussman <sussman@collab.net>]
  +
     *) mod_cgid: Eliminate a double-close of a socket.  This resolves
        various operational problems in a threaded MPM, since on the
        second attempt to close the socket, the same descriptor was
  
  
  
  No                   revision
  No                   revision
  1.225.2.7 +3 -1      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.225.2.6
  retrieving revision 1.225.2.7
  diff -u -r1.225.2.6 -r1.225.2.7
  --- core.c	13 May 2003 16:01:04 -0000	1.225.2.6
  +++ core.c	1 Jul 2003 00:13:34 -0000	1.225.2.7
  @@ -3754,7 +3754,9 @@
                   break;
               }
               if (APR_BUCKET_IS_FLUSH(e)) {
  -                more = apr_brigade_split(b, APR_BUCKET_NEXT(e));
  +                if (e != APR_BRIGADE_LAST(b)) {
  +                    more = apr_brigade_split(b, APR_BUCKET_NEXT(e));
  +                }
                   break;
               }
   
  
  
  

Mime
View raw message