From db95cd94c0cf5baac19018705b8cfbaa3367a80e Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 15 Sep 2009 20:32:30 +0200 Subject: [PATCH] [BUG] buffer_forward() would not correctly consider data already scheduled The computations in buffer_forward() were only valid if buffer_forward() was used on a buffer which had no more data scheduled for forwarding. This is always the case right now so this bug is not yet triggered but it will soon be. Now we correctly discount the bytes to be forwarded from the data already present in the buffer. (cherry picked from commit 91aa577b1f0483c50bfa72b3198cf1a1ff835163) --- include/proto/buffers.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/proto/buffers.h b/include/proto/buffers.h index dc9961a2bd..95e1ab374c 100644 --- a/include/proto/buffers.h +++ b/include/proto/buffers.h @@ -99,12 +99,13 @@ static inline void buffer_forward(struct buffer *buf, unsigned int bytes) { unsigned int data_left; - buf->to_forward += bytes; data_left = buf->l - buf->send_max; - if (data_left > buf->to_forward) - data_left = buf->to_forward; + if (data_left >= bytes) { + buf->send_max += bytes; + return; + } - buf->to_forward -= data_left; + buf->to_forward += bytes - data_left; buf->send_max += data_left; } -- 2.47.3