From: David Carlier <dcarlier@afilias.info>
Date: Tue, 15 Jan 2019 12:09:00 +0000 (+0000)
Subject: BUILD/MEDIUM: da: Necessary code changes for new buffer API.
X-Git-Tag: v2.0-dev1~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8f8ddf3afd3a73a6658394f5fd2a3cb46835a68;p=thirdparty%2Fhaproxy.git

BUILD/MEDIUM: da: Necessary code changes for new buffer API.

The most significant change from 1.8 to >=1.9 is the buffer
data structure, using the new field and fixing along side
a little hidden compilation warning.

This must be backported to 1.9.
---

diff --git a/src/da.c b/src/da.c
index 61d6422e96..0a49d52985 100644
--- a/src/da.c
+++ b/src/da.c
@@ -309,7 +309,7 @@ static int da_haproxy_fetch(const struct arg *args, struct sample *smp, const ch
 	hidx = &smp->strm->txn->hdr_idx;
 	hmsg = &smp->strm->txn->req;
 
-	while (http_find_next_header(hmsg->chn->buf->p, hidx, &hctx) == 1 &&
+	while (http_find_next_header(ci_head(hmsg->chn), hidx, &hctx) == 1 &&
 	        nbh < DA_MAX_HEADERS) {
 		char *pval;
 		size_t vlen;
@@ -331,7 +331,7 @@ static int da_haproxy_fetch(const struct arg *args, struct sample *smp, const ch
 				atlas);
 		} else if (strcmp(hbuf, "Cookie") == 0) {
 			char *p, *eval;
-			int pl;
+			size_t pl;
 
 			eval = pval + hctx.vlen;
 			/**