]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1837130 from trunk:
authorYann Ylavic <ylavic@apache.org>
Tue, 28 Aug 2018 20:07:07 +0000 (20:07 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 28 Aug 2018 20:07:07 +0000 (20:07 +0000)
commit831ef7623e9700e12432a9cf865935cd83c2b502
treee1f62edcc41cc6196b54d2d6ea769d84543b49a7
parentafc3500b3213d6228712d7bdfbd5bc5b002fb2d4
Merge r1837130 from trunk:

mod_ratelimit: Don't interfere with "chunked" encoding.

By the time ap_http_header_filter() sends the header brigade and adds the
"CHUNK" filter, we need to garantee that the header went through all the
filters' stack, and more specifically above ap_http_chunk_filter() which
assumes that all it receives is content data.
Since rate_limit_filter() may retain the header brigade, make it run after
ap_http_chunk_filter(), just before AP_FTYPE_CONNECTION filters.

Also, ap_http_header_filter() shouldn't eat the EOS for HEAD/no-body responses.
For instance mod_ratelimit depends on it since r1835168, but any next request
filter may as well to flush and/or bail out approprietely.

This fixes the regression introduced in 2.4.34 (r1835168).
PR 62568.

Submitted by: ylavic
Reviewed by: covener, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1839497 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/filters/mod_ratelimit.c
modules/http/chunk_filter.c
modules/http/http_filters.c