Commit 8c53b9ec authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Backport of 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@357454 13f79535-47bb-0310-9956-ffa450edef68
parent efa020a8

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.56









  *) 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_imap: Escape untrusted referer header before outputting in HTML









     to avoid potential cross-site scripting.  Change also made to


































modules/http/http_core.c



+2
−0



























Changes for modules/http/http_core.c: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -124,6 +124,8 @@ static apr_status_t chunk_filter(ap_filter_t *f, apr_bucket_brigade *b)







            }









            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) */