mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-30 07:11:04 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: channel: make buffer_reserved() use channel_in_transit()

Browse Source 
This ensures that we rely on a sane computation for the buffer size.
This commit is contained in:
Willy Tarreau 2015-01-14 14:07:13 +01:00
parent 1a4484dec8
commit fe57834955
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/proto/channel.h
View File

@ -287,16 +287,11 @@ static inline void channel_dont_read(struct channel *chn)
*/ */
static inline int buffer_reserved(const struct channel *chn) static inline int buffer_reserved(const struct channel *chn)
{ {
unsigned int reserved = global.tune.maxrewrite; int reserved;
if (chn->to_forward == CHN_INFINITE_FORWARD || reserved = global.tune.maxrewrite - channel_in_transit(chn);
chn->to_forward >= reserved || if (reserved < 0)
chn->buf->o >= reserved ||
chn->to_forward + chn->buf->o >= reserved)
reserved = 0; reserved = 0;
else
reserved -= chn->to_forward + chn->buf->o;
return reserved; return reserved;
} }