httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Mon, 17 May 2004 15:24:31 GMT
jorton      2004/05/17 08:24:31

  Modified:    server   core.c
  Log:
  * server/core.c (core_output_filter): Don't explicitly delete the EOC
  bucket, and don't buffer the brigade if it ends in an EOC.
  
  Revision  Changes    Path
  1.277     +4 -5      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.276
  retrieving revision 1.277
  diff -d -u -r1.276 -r1.277
  --- core.c	25 Apr 2004 17:23:31 -0000	1.276
  +++ core.c	17 May 2004 15:24:31 -0000	1.277
  @@ -3945,12 +3945,9 @@
           {
               /* keep track of the last bucket processed */
               last_e = e;
  -            if (APR_BUCKET_IS_EOS(e)) {
  +            if (APR_BUCKET_IS_EOS(e) || AP_BUCKET_IS_EOC(e)) {
                   break;
               }
  -            if (AP_BUCKET_IS_EOC(e)) {
  -                apr_bucket_delete(e);
  -            }
               else if (APR_BUCKET_IS_FLUSH(e)) {
                   if (e != APR_BRIGADE_LAST(b)) {
                       more = apr_brigade_split(b, APR_BUCKET_NEXT(e));
  @@ -4106,7 +4103,8 @@
           /* Completed iterating over the brigade, now determine if we want
            * to buffer the brigade or send the brigade out on the network.
            *
  -         * Save if we haven't accumulated enough bytes to send, and:
  +         * Save if we haven't accumulated enough bytes to send, the connection
  +         * is not about to be closed, and:
            *
            *   1) we didn't see a file, we don't have more passes over the
            *      brigade to perform,  AND we didn't stop at a FLUSH bucket.
  @@ -4117,6 +4115,7 @@
            *       with the hope of concatenating with another response)
            */
           if (nbytes + flen < AP_MIN_BYTES_TO_WRITE
  +            && !AP_BUCKET_IS_EOC(last_e)
               && ((!fd && !more && !APR_BUCKET_IS_FLUSH(last_e))
                   || (APR_BUCKET_IS_EOS(last_e)
                       && c->keepalive == AP_CONN_KEEPALIVE))) {
  
  
  

Mime
View raw message