From: Tim Duesterhus <tim@bastelstu.be>
Date: Tue, 2 Mar 2021 17:57:26 +0000 (+0100)
Subject: CLEANUP: Reapply the ist2() replacement patch
X-Git-Tag: v2.4-dev11~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f75ed114f5a7be20b2473e0e639091cd370567d;p=thirdparty%2Fhaproxy.git

CLEANUP: Reapply the ist2() replacement patch

One location was not matched due to a typo. Reapply the patch for consistency.

see 92c696e663ab4bbcffd5dc0afedf1d0afd1c7279
see a3298023b04923ba12429d79c559dc7a850ae122
---

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 4dada0b0c6..3810943c55 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -5360,8 +5360,7 @@ static size_t h2s_bck_make_req_headers(struct h2s *h2s, struct htx *htx)
 
 			if (len + 2 < uri.len && uri.ptr[len + 1] == '/' && uri.ptr[len + 2] == '/') {
 				/* make the uri start at the authority now */
-				scheme.ptr = uri.ptr;
-				scheme.len = len;
+				scheme = ist2(uri.ptr, len);
 				uri.ptr += len + 3;
 				uri.len -= len + 3;