From 21348e2bedaca7a01f006ff971340c766cc52cc3 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 17 Jul 2017 13:44:30 +0000 Subject: [PATCH] Merge r1754164, r1801994, r1801995 from trunk: mod_proxy_wstunnel: we want to detect whether some response was sent to the client when forwarding data from the backend to the client, not the reverse. Follow up to r1754164: CHANGES entry. Follow up to r1801994: CHANGES' PR reference. Submitted by: ylavic Reviewed by: ylavic, jchampion, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1802144 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 10 ---------- modules/proxy/mod_proxy_wstunnel.c | 4 ++-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index b3774e8b3f..f5709b520e 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.28 + *) mod_proxy_wstunnel: Fix detection of unresponded request which could have + led to spurious HTTP 502 error messages sent on upgrade connections. + PR 61283. [Yann Ylavic] Changes with Apache 2.4.27 diff --git a/STATUS b/STATUS index 260c8db44d..9d25049de8 100644 --- a/STATUS +++ b/STATUS @@ -130,16 +130,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-mpm_event-wakeup-v7.1.patch +1: ylavic, icing, jim - *) mod_proxy_wstunnel: Fix detection of unresponded request which could have - led to spurious HTTP 502 error messages sent on upgrade connections. - PR 61283 - trunk patch: http://svn.apache.org/r1754164 - http://svn.apache.org/r1801994 - http://svn.apache.org/r1801995 - 2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-mod_proxy_wstunnel-PR61283.patch - +1: ylavic, jchampion, jim - - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c index 0130699005..b0f3bcc661 100644 --- a/modules/proxy/mod_proxy_wstunnel.c +++ b/modules/proxy/mod_proxy_wstunnel.c @@ -204,7 +204,7 @@ static int proxy_wstunnel_request(apr_pool_t *p, request_rec *r, c, header_brigade, bb, "sock", - NULL, + &replied, AP_IOBUFSIZE, 0) != APR_SUCCESS; @@ -230,7 +230,7 @@ static int proxy_wstunnel_request(apr_pool_t *p, request_rec *r, backconn, bb, header_brigade, "client", - &replied, + NULL, AP_IOBUFSIZE, 0) != APR_SUCCESS; -- 2.40.0