Commit ca6bf55c authored Jul 17, 2017 by Jim Jagielski

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

parent bf58816f

CHANGES

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

STATUS

+0 −10

Original line number	Diff line number	Diff line
		@@ -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 ]

modules/proxy/mod_proxy_wstunnel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;