RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-01 11:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: backend: use new buffer API

Browse Source 
The few locations dealing with the buffer rewind were updated not to
touch ->o nor ->p anymore and to use the channel's functions instead.
This commit is contained in:
Willy Tarreau 2018-06-19 07:04:45 +02:00
parent 7e9c30a7e0
commit 6a445ebc8a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend.c
View File

@ -329,8 +329,8 @@ static struct server *get_server_ph_post(struct stream *s)
if (len == 0)
return NULL;
if (len > req->buf->data + req->buf->size - p)
len = req->buf->data + req->buf->size - p;
if (len > b_wrap(req->buf) - p)
len = b_wrap(req->buf) - p;
if (px->lbprm.tot_weight == 0)
return NULL;
@ -485,7 +485,8 @@ static struct server *get_server_rch(struct stream *s)
memset(&smp, 0, sizeof(smp));
c_rew(&s->req, rewind = s->req.buf->o);
rewind = co_data(&s->req);
c_rew(&s->req, rewind);
ret = fetch_rdp_cookie_name(s, &smp, px->hh_name, px->hh_len);
len = smp.data.u.str.len;
@ -1260,7 +1261,7 @@ int connect_server(struct stream *s)
* rewind exactly the headers, otherwise we rewind the
* output data.
*/
rewind = s->txn ? http_hdr_rewind(&s->txn->req) : s->req.buf->o;
rewind = s->txn ? http_hdr_rewind(&s->txn->req) : co_data(&s->req);
c_rew(&s->req, rewind);
smp = sample_fetch_as_type(s->be, s->sess, s, SMP_OPT_DIR_REQ | SMP_OPT_FINAL, srv->ssl_ctx.sni, SMP_T_STR);