httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1298451 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS modules/filters/mod_xml2enc.c
Date Thu, 08 Mar 2012 16:09:43 GMT
Author: jim
Date: Thu Mar  8 16:09:43 2012
New Revision: 1298451

URL: http://svn.apache.org/viewvc?rev=1298451&view=rev
Log:
Merge r1293717 from trunk:

Pass the EOS bucket down the filter chain

PR: 52766

Submitted by: sf
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1298451&r1=1298450&r2=1298451&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Mar  8 16:09:43 2012
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.2
 
+  *) mod_xml2enc: Fix broken handling of EOS buckets which could lead to
+     response headers not being sent. PR 52766. [Stefan Fritsch]
+
   *) mod_ssl: Properly free the GENERAL_NAMEs. PR 32652.
 
   *) core: Check during config test that directories for the access

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1298451&r1=1298450&r2=1298451&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Mar  8 16:09:43 2012
@@ -89,13 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-* mod_xml2enc: Fix handling of EOS buckets.
-   Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1293717
-   2.4.x patch: Trunk patch works, needs CHANGES entry:
-     mod_xml2enc: Fix broken handling of EOS buckets which could lead to
-     response headers not being sent. PR 52766. [Stefan Fritsch]
-   +1: sf, covener, jim
-
  * envvars: Fix handling of LD_LIBRARY_PATH. CVE-2012-0883
    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1296428
    2.4.x patch: Trunk patch works

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c?rev=1298451&r1=1298450&r2=1298451&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c Thu Mar  8 16:09:43 2012
@@ -392,13 +392,14 @@ static apr_status_t xml2enc_ffunc(ap_fil
     while (b = APR_BRIGADE_FIRST(bb), b != APR_BRIGADE_SENTINEL(bb)) {
         ctx->bytes = 0;
         if (APR_BUCKET_IS_METADATA(b)) {
+            APR_BUCKET_REMOVE(b);
             if (APR_BUCKET_IS_EOS(b)) {
                 /* send remaining data */
+                APR_BRIGADE_INSERT_TAIL(ctx->bbnext, b);
                 return ap_fflush(f->next, ctx->bbnext);
             } else if (APR_BUCKET_IS_FLUSH(b)) {
                 ap_fflush(f->next, ctx->bbnext);
             }
-            APR_BUCKET_REMOVE(b);
             apr_bucket_destroy(b);
         }
         else {        /* data bucket */



Mime
View raw message