From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 20 Jul 2018 07:54:26 +0000 (+0200)
Subject: BUG/MINOR: http: Set brackets for the unlikely macro at the right place
X-Git-Tag: v1.9-dev1~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=005e79e5dd7e6bb915ebba793e030c1fcc2dc4f6;p=thirdparty%2Fhaproxy.git

BUG/MINOR: http: Set brackets for the unlikely macro at the right place

When test on the header "Early-Data" is made, the unlikely macro must encompass
the condition.

This patch must be backported in 1.8.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index 117d27404a..56035b9cb2 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3526,7 +3526,7 @@ int http_process_req_common(struct stream *s, struct channel *req, int an_bit, s
 		    ci_head(&s->req), &txn->hdr_idx, &ctx)) {
 			if (unlikely(http_header_add_tail2(&txn->req,
 			    &txn->hdr_idx, "Early-Data: 1",
-			    strlen("Early-Data: 1"))) < 0) {
+			    strlen("Early-Data: 1")) < 0)) {
 				goto return_bad_req;
 			 }
 		}