httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Tue, 01 May 2001 21:59:27 GMT
rbb         01/05/01 14:59:27

  Modified:    server   core.c
  Log:
  Fix the logic for saving data onto the heap before sending it.  Basically,
  we have to use nbytes+flen when figuring out how much data we have,
  and when looking at the fact that we have a buffer to save aside before
  sending it, we also need to look at the length, to ensure that we aren't
  saving too much.
  Submitted by:	Bill Stoddard and Ryan Bloom
  
  Revision  Changes    Path
  1.13      +2 -2      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -d -b -w -u -r1.12 -r1.13
  --- core.c	2001/05/01 19:40:14	1.12
  +++ core.c	2001/05/01 21:59:26	1.13
  @@ -3134,8 +3134,8 @@
            *       with the hope of concatenating with another response)
            */
           if ((!fd && !more && 
  -             (nbytes < AP_MIN_BYTES_TO_WRITE) && !APR_BUCKET_IS_FLUSH(e))
  -            || (APR_BUCKET_IS_EOS(e) && c->keepalive)) {
  +            (nbytes + flen < AP_MIN_BYTES_TO_WRITE) && !APR_BUCKET_IS_FLUSH(e))
  +            || (nbytes + flen < AP_MIN_BYTES_TO_WRITE && APR_BUCKET_IS_EOS(e)
&& c->keepalive)) {
               /* NEVER save an EOS in here.  If we are saving a brigade with 
                * an EOS bucket, then we are doing keepalive connections, and 
                * we want to process to second request fully.
  
  
  

Mime
View raw message