httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r357456 - in /httpd/httpd/branches/2.2.x: CHANGES modules/http/chunk_filter.c
Date Sun, 18 Dec 2005 11:21:15 GMT
Author: rpluem
Date: Sun Dec 18 03:21:05 2005
New Revision: 357456

URL: http://svn.apache.org/viewcvs?rev=357456&view=rev
Log:
Merge r357328 from trunk:

* Fix ap_http_chunk_filter to create correct chunks in the case that a
  flush bucket is pre- and postfixed by data buckets in the brigade.

Submitted by: Ruediger Pluem
Reviewed by: Justin Erenkrantz, Joe Orton, Jim Jagielski

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/http/chunk_filter.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=357456&r1=357455&r2=357456&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Dec 18 03:21:05 2005
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) Chunk filter: Fix chunk filter to create correct chunks in the case that
+     a flush bucket is surrounded by data buckets. [Ruediger Pluem]
+
   *) SECURITY: CVE-2005-3352 (cve.mitre.org)
      mod_imagemap: Escape untrusted referer header before outputting
      in HTML to avoid potential cross-site scripting.  Change also

Modified: httpd/httpd/branches/2.2.x/modules/http/chunk_filter.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/http/chunk_filter.c?rev=357456&r1=357455&r2=357456&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/chunk_filter.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/chunk_filter.c Sun Dec 18 03:21:05 2005
@@ -69,6 +69,8 @@
             }
             if (APR_BUCKET_IS_FLUSH(e)) {
                 flush = e;
+                more = apr_brigade_split(b, APR_BUCKET_NEXT(e));
+                break;
             }
             else if (e->length == (apr_size_t)-1) {
                 /* unknown amount of data (e.g. a pipe) */



Mime
View raw message