mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: buffer: replace buffer_flush() with c_adv(chn, ci_data(chn))

Browse Source 
It used to forward some input into output.
This commit is contained in:
Willy Tarreau 2018-06-15 15:16:51 +02:00
parent 5ba65521a3
commit 144c5c4d21
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/common/buffer.h
View File

@ -124,17 +124,6 @@ static inline void bi_fast_delete(struct buffer *buf, int n)
buf->p += n;
}
/* Schedule all remaining buffer data to be sent. ->o is not touched if it
* already covers those data. That permits doing a flush even after a forward,
* although not recommended.
*/
static inline void buffer_flush(struct buffer *buf)
{
buf->p = buffer_wrap_add(buf, buf->p + buf->i);
buf->o += buf->i;
buf->i = 0;
}
/* This function writes the string <str> at position <pos> which must be in
* buffer <b>, and moves <end> just after the end of <str>. <b>'s parameters
* (l, r, lr) are updated to be valid after the shift. the shift value

4
src/stream.c
View File

@ -2106,7 +2106,7 @@ struct task *process_stream(struct task *t, void *context, unsigned short state)
channel_auto_read(req);
channel_auto_connect(req);
channel_auto_close(req);
buffer_flush(req->buf);
c_adv(req, ci_data(req));
/* We'll let data flow between the producer (if still connected)
* to the consumer (which might possibly not be connected yet).
@ -2265,7 +2265,7 @@ struct task *process_stream(struct task *t, void *context, unsigned short state)
*/
channel_auto_read(res);
channel_auto_close(res);
buffer_flush(res->buf);
c_adv(res, ci_data(res));
/* We'll let data flow between the producer (if still connected)
* to the consumer.