]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD/MEDIUM: da: Necessary code changes for new buffer API.
authorDavid Carlier <dcarlier@afilias.info>
Tue, 15 Jan 2019 12:09:00 +0000 (12:09 +0000)
committerWilly Tarreau <w@1wt.eu>
Tue, 15 Jan 2019 14:07:30 +0000 (15:07 +0100)
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.

src/da.c

index 61d6422e96bc84ec296671d1e9972bb083b4830c..0a49d529857489a339f529eca388ecf86c1b97e5 100644 (file)
--- 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;
                        /**