From: Tim Duesterhus <tim@bastelstu.be>
Date: Fri, 4 Mar 2022 23:52:44 +0000 (+0100)
Subject: CLEANUP: fcgi: Replace memcpy() on ist by istcat()
X-Git-Tag: v2.6-dev3~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98f05f6a38c35d52081d72a31a9c3cd9140e28d8;p=thirdparty%2Fhaproxy.git

CLEANUP: fcgi: Replace memcpy() on ist by istcat()

This is a little cleaner, because the length of the resulting string does not
need to be calculated manually.
---

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index a22bc9391f..0a8679019a 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -2030,6 +2030,8 @@ static size_t fcgi_strm_send_params(struct fcgi_conn *fconn, struct fcgi_strm *f
 				else if (isteq(p.n, ist("content-type")))
 					p.n = ist("CONTENT_TYPE");
 				else {
+					struct ist n;
+
 					if (isteq(p.n, ist("host")))
 						params.srv_name = p.v;
 					else if (isteq(p.n, ist("te"))) {
@@ -2046,9 +2048,10 @@ static size_t fcgi_strm_send_params(struct fcgi_conn *fconn, struct fcgi_strm *f
 					if (isttest(fconn->proxy->server_id_hdr_name) && isteq(p.n, fconn->proxy->server_id_hdr_name))
 						break;
 
-					memcpy(trash.area, "http_", 5);
-					memcpy(trash.area+5, p.n.ptr, p.n.len);
-					p.n = ist2(trash.area, p.n.len+5);
+					n = ist2(trash.area, 0);
+					istcat(&n, ist("http_"), trash.size);
+					istcat(&n, p.n, trash.size);
+					p.n = n;
 				}
 
 				if (!fcgi_encode_param(&outbuf, &p)) {