]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1599012, r1601559, r1818624, r1819969, r1819970 from trunk:
authorYann Ylavic <ylavic@apache.org>
Sat, 13 Jan 2018 15:57:11 +0000 (15:57 +0000)
committerYann Ylavic <ylavic@apache.org>
Sat, 13 Jan 2018 15:57:11 +0000 (15:57 +0000)
commitbf9f2a71aebfdc54d77f53c381da58af066bdf3e
tree9fe785d4f30f51442ee3e6809aa4965f0c217aa9
parent8e3695a7048cf83ccef314998cb9c1dde363bc81
Merge r1599012, r1601559, r1818624, r1819969, r1819970 from trunk:

mod_proxy_html: skip documents < 4 bytes
PR 56286
Micha Lenk

follow up r1599012:
C99 fix

Fix some style

mod_proxy_html: follow up to r1599012.

To determine whether or not HTML data are lower than 4 bytes, use a retain
buffer rather than assuming that all should be contained in a single bucket
with the next one being EOS (if any).

mod_proxy_html: don't depend on NUL terminated bucket data.

ap_regexec() wants NUL terminated strings, so use ap_regexec_len() instead.

Submitted by: niq, takashi, jailletc36, ylavic, ylavic
Reviewed by: jim, ylavic, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1821073 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/filters/mod_proxy_html.c