httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Mathihalli, Madhusudan" <mad...@hp.com>
Subject [PATCH] followup with EOC bucket type
Date Fri, 26 Mar 2004 20:01:30 GMT
Hello,
	Should we just ignore the rest of the processing in core_output_filter after deleting the
EOC bucket ?

-Madhu

Index: server/core.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/core.c,v
retrieving revision 1.270
diff -u -r1.270 core.c
--- server/core.c       25 Mar 2004 14:27:27 -0000      1.270
+++ server/core.c       26 Mar 2004 19:54:21 -0000
@@ -3863,6 +3863,8 @@
          */
         apr_bucket *last_merged_bucket = NULL;
 
+        apr_int32_t eoc_received = 0;
+
         /* tail of brigade if we need another pass */
         more = NULL;
 
@@ -3877,6 +3879,7 @@
                 break;
             }
             if (AP_BUCKET_IS_EOC(e)) {
+                eoc_received = 1;
                 apr_bucket_delete(e);
             }
             else if (APR_BUCKET_IS_FLUSH(e)) {
@@ -4045,6 +4048,7 @@
          *       with the hope of concatenating with another response)
          */
         if (nbytes + flen < AP_MIN_BYTES_TO_WRITE
+            && !eoc_received
             && ((!fd && !more && !APR_BUCKET_IS_FLUSH(last_e))
                 || (APR_BUCKET_IS_EOS(last_e)
                     && c->keepalive == AP_CONN_KEEPALIVE))) {

Mime
View raw message