]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1878280 from trunk:
authorYann Ylavic <ylavic@apache.org>
Fri, 26 Jun 2020 10:21:19 +0000 (10:21 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 26 Jun 2020 10:21:19 +0000 (10:21 +0000)
commitced24e032ebe185a2d885fa309d6de47668ba31e
tree58a46c61d23eec81f9cb59d0d9dbc99b89fe98ad
parent44b562be443f1c1bd184e74cef58e0133b5bc3d7
Merge r1878280 from trunk:

mod_proxy_http: don't strip EOS when spooling request body to file.

To prevent stream_reqbody() from sending the FILE and FLUSH bucket in separate
brigades, and thus apr_file_setaside() to trigger if network congestion occurs
with the backend, restore the EOS in spool_reqbody_cl() which was stripped
when spooling the request body to a file.

Until APR r1878279 is released (and installed by users), apr_file_setaside()
on a temporary file (mktemp) will simply drop the file cleanup, leaking the
fd and inode..

This fixes BZ 64452.

Submitted by: ylavic
Reviewed by: ylavic, jorton, rpluem

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