]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1892740, r1892851 from trunk:
authorYann Ylavic <ylavic@apache.org>
Mon, 6 Sep 2021 08:34:19 +0000 (08:34 +0000)
committerYann Ylavic <ylavic@apache.org>
Mon, 6 Sep 2021 08:34:19 +0000 (08:34 +0000)
commit4ef2a7fcff9258bce2eb21a1f5b9f7481286308c
tree030043422545172b84515a1a15ef2bc35eb70cec
parent771bc81cd94d2c419d152779a0c76b3a5f2ecce6
Merge r1892740, r1892851 from trunk:

mod_proxy: Fix potential tunneling infinite loop and spurious timeout.
           PRs 65521 and 65519.

* modules/proxy/proxy_util.c(ap_proxy_tunnel_run):
  Avoid an infinite loop by shutting down the connection for write when poll()
  returns POLLHUP and read is already down.  PR 65521.

* modules/proxy/proxy_util.c(ap_proxy_tunnel_run):
  When write completion is finished don't check for ap_filter_input_pending()
  before proxy_tunnel_forward() to flush input data, this is a nonblocking read
  already which will do the same thing implicitely. ap_filter_input_pending()
  is broken in 2.4.x without the whole pending data mechanism (not backported
  yet), so let's align here.  PR 65519.

mod_proxy: Follow up to r1892740.

Really remove the old ap_filter_input_pending() handling forgotten by r1892740.

Submitted by: ylavic
Reviewed by: ylavic, covener, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892971 13f79535-47bb-0310-9956-ffa450edef68
changes-entries/ap_proxy_tunnel_run.txt [new file with mode: 0644]
modules/proxy/mod_proxy_http.c
modules/proxy/proxy_util.c