From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 14 Jun 2019 08:46:51 +0000 (+0200)
Subject: MINOR: mux-h2: Forward clients scheme to servers checking start-line flags
X-Git-Tag: v2.0.0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b44c54129a4f8334834dda6344c512e76e883fa;p=thirdparty%2Fhaproxy.git

MINOR: mux-h2: Forward clients scheme to servers checking start-line flags

By default, the scheme "https" is always used. But when an explicit scheme was
defined and when this scheme is "http", we use it in the request sent to the
server. This is done by checking flags of the start-line. If the flag
HTX_SL_F_HAS_SCHM is set, it means an explicit scheme was defined on the client
side. And if the flag HTX_SL_F_SCHM_HTTP is set, it means the scheme "http" was
used.
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 8984256586..c1ee2c4e69 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -4718,7 +4718,14 @@ static size_t h2s_htx_bck_make_req_headers(struct h2s *h2s, struct htx *htx)
 	 */
 	if (sl->info.req.meth != HTTP_METH_CONNECT) {
 		/* encode the scheme which is always "https" (or 0x86 for "http") */
-		if (!hpack_encode_scheme(&outbuf, ist("https"))) {
+		struct ist scheme;
+
+		if ((sl->flags & (HTX_SL_F_HAS_SCHM|HTX_SL_F_SCHM_HTTP)) == (HTX_SL_F_HAS_SCHM|HTX_SL_F_SCHM_HTTP))
+			scheme = ist("http");
+		else
+			scheme = ist("https");
+
+		if (!hpack_encode_scheme(&outbuf, scheme)) {
 			/* output full */
 			if (b_space_wraps(mbuf))
 				goto realign_again;