Skip to content

Commit 7996ffc

Browse files
committed
Merge r1912460, r1925743 from trunk:
mod_proxy: Consistently close the socket on failure to reuse the connection. proxy_connection_create() and ap_proxy_connect_backend() sometimes close the connection on failure, sometimes not. Always close it. mod_proxy: restore reuse of ProxyRemote connections when possible. Fixes a regression from 2.4.59 (r1913907). For a reverse proxy setup with a worker (enablereuse=on) and a forward/CONNECT ProxyRemote to reach it, an open connection/tunnel to/through the remote proxy for the same origin server (and using the same proxy auth) should be reusable. Avoid closing them like r1913534 did. * modules/proxy/proxy_util.c: Rename the struct to remote_connect_info since it's only used for connecting through remote CONNECT proxies. Axe the use_http_connect field, always true. * modules/proxy/proxy_util.c(ap_proxy_connection_reusable): Remote CONNECT (forward) proxy connections can be reused if the auth and origin server infos are the same, so conn->forward != NULL is not a condition to prevent reusability. * modules/proxy/proxy_util.c(ap_proxy_determine_connection): Fix the checks around conn->forward reuse and connection cleanup if that's not possible. Submitted by: jfclere, ylavic Reviewed by: ylavic, jfclere, rpluem Github: closes #532 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926317 13f79535-47bb-0310-9956-ffa450edef68
1 parent af0c093 commit 7996ffc

File tree

2 files changed

+97
-99
lines changed

2 files changed

+97
-99
lines changed

CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
-*- coding: utf-8 -*-
22
Changes with Apache 2.4.64
33

4+
*) mod_proxy: Reuse ProxyRemote connections when possible, like prior
5+
to 2.4.59. [Jean-Frederic Clere, Yann Ylavic]
6+
47
*) mod_systemd: Add systemd socket activation support. [Paul Querna,
58
Jan Kaluza, Lubos Uhliarik <luhliari redhat.com>, Joe Orton]
69

0 commit comments

Comments
 (0)