]> granicus.if.org Git - apache/commit
Merge r1657636, r1657638, r1669130 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 31 Mar 2015 12:53:00 +0000 (12:53 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 31 Mar 2015 12:53:00 +0000 (12:53 +0000)
commitfbf179056aec2c4d1aa9cc1cd346c7b7f2f24e11
treee8c31f9b683e513c55367a67300bc9286da5c6c1
parent9a7755e33ce97f0ea0db192e9b2a73d34fd33a3a
Merge r1657636, r1657638, r1669130 from trunk:

mod_proxy_connect/wstunnel: If both client and backend sides get readable
at the same time, don't lose errors occuring while forwarding on the first
side when none occurs next on the other side, and abort.

CHANGES: Follow up to r1657636, clarify message.

mod_proxy_{connect,wstunnel}: follow up to r1657636.
Since rv is not used as an apr_status_t in the loop (it's logging is done by
proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean
instead to avoid the ugly ORs between APR error codes.

Submitted by: ylavic
Reviewed/backported by: jim

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