RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: cache: use the new buffer API

Browse Source 
A few direct accesses to buf->p now use ci_head() instead.
This commit is contained in:
Willy Tarreau 2018-06-19 07:13:36 +02:00
parent 851d12c3d4
commit 178b987025
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cache.c
View File

@ -339,7 +339,7 @@ int http_calc_maxage(struct stream *s, struct cache *cache)
ctx.idx = 0; ctx.idx = 0;
/* loop on the Cache-Control values */ /* loop on the Cache-Control values */
while (http_find_header2("Cache-Control", 13, s->res.buf->p, &txn->hdr_idx, &ctx)) { while (http_find_header2("Cache-Control", 13, ci_head(&s->res), &txn->hdr_idx, &ctx)) {
char *directive = ctx.line + ctx.val; char *directive = ctx.line + ctx.val;
char *value; char *value;
@ -426,7 +426,7 @@ enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
/* Does not manage Vary at the moment. We will need a secondary key later for that */ /* Does not manage Vary at the moment. We will need a secondary key later for that */
ctx.idx = 0; ctx.idx = 0;
if (http_find_header2("Vary", 4, txn->rsp.chn->buf->p, &txn->hdr_idx, &ctx)) if (http_find_header2("Vary", 4, ci_head(txn->rsp.chn), &txn->hdr_idx, &ctx))
goto out; goto out;
check_response_for_cacheability(s, &s->res); check_response_for_cacheability(s, &s->res);
@ -464,7 +464,7 @@ enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
/* does not need to be locked because it's in the "hot" list, /* does not need to be locked because it's in the "hot" list,
* copy the headers */ * copy the headers */
if (shctx_row_data_append(shctx, first, (unsigned char *)s->res.buf->p, msg->sov) < 0) if (shctx_row_data_append(shctx, first, (unsigned char *)ci_head(&s->res), msg->sov) < 0)
goto out; goto out;
/* register the buffer in the filter ctx for filling it with data*/ /* register the buffer in the filter ctx for filling it with data*/
@ -567,7 +567,7 @@ static void http_cache_io_handler(struct appctx *appctx)
if (appctx->st0 == HTTP_CACHE_FWD) { if (appctx->st0 == HTTP_CACHE_FWD) {
/* eat the whole request */ /* eat the whole request */
co_skip(si_oc(si), si_ob(si)->o); // NOTE: when disabled does not repport the correct status code co_skip(si_oc(si), co_data(si_oc(si))); // NOTE: when disabled does not repport the correct status code
res->flags |= CF_READ_NULL; res->flags |= CF_READ_NULL;
si_shutr(si); si_shutr(si);
} }
@ -644,12 +644,12 @@ int sha1_hosturi(struct http_txn *txn)
/* retrive the host */ /* retrive the host */
ctx.idx = 0; ctx.idx = 0;
if (!http_find_header2("Host", 4, txn->req.chn->buf->p, &txn->hdr_idx, &ctx)) if (!http_find_header2("Host", 4, ci_head(txn->req.chn), &txn->hdr_idx, &ctx))
return 0; return 0;
chunk_strncat(trash, ctx.line + ctx.val, ctx.vlen); chunk_strncat(trash, ctx.line + ctx.val, ctx.vlen);
/* now retrieve the path */ /* now retrieve the path */
end = txn->req.chn->buf->p + txn->req.sl.rq.u + txn->req.sl.rq.u_l; end = ci_head(txn->req.chn) + txn->req.sl.rq.u + txn->req.sl.rq.u_l;
path = http_get_path(txn); path = http_get_path(txn);
if (!path) if (!path)
return 0; return 0;