Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 26 Nov 2001 07:21:48 -0000
Message-ID: <20011126072148.4548.qmail@icarus.apache.org>
From: brianp@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server core.c

brianp      01/11/25 23:21:48

  Modified:    server   core.c
  Log:
  More fixes for core_input_filter()'s concatenation of small buckets:
  update last_e and nbytes after compacting the brigade
  
  Revision  Changes    Path
  1.107     +2 -0      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- core.c	2001/11/26 03:51:40	1.106
  +++ core.c	2001/11/26 07:21:48	1.107
  @@ -3088,6 +3088,7 @@
                               while (temp != e) {
                                   apr_bucket *d;
                                   rv = apr_bucket_read(temp, &str, &n, APR_BLOCK_READ);
  +                                nbytes -= n;
                                   apr_brigade_write(temp_brig, NULL, NULL, str, n);
                                   d = temp;
                                   temp = APR_BUCKET_NEXT(temp);
  @@ -3098,6 +3099,7 @@
                               APR_BRIGADE_INSERT_HEAD(b, temp);
                               apr_brigade_destroy(temp_brig);
                               e = temp;
  +                            last_e = e;
                               nvec = 0;
                               apr_bucket_read(e, &str, &n, APR_BLOCK_READ);
                           }