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

BUG/MINOR: compression: correctly report incoming byte count

Browse Source 
The fixes merged into 1.5-dev23 on compression resulted in the input
byte count not being correctly computed and always reported as zero.
This commit is contained in:
Willy Tarreau 2014-04-23 19:31:17 +02:00
parent 060762e67d
commit 3ca5448828
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/compression.c
View File

@ -211,7 +211,7 @@ int http_compression_buffer_add_data(struct session *s, struct buffer *in, struc
*/ */
int http_compression_buffer_end(struct session *s, struct buffer **in, struct buffer **out, int end) int http_compression_buffer_end(struct session *s, struct buffer **in, struct buffer **out, int end)
{ {
int to_forward, forwarded; int to_forward;
int left; int left;
struct http_msg *msg = &s->txn.rsp; struct http_msg *msg = &s->txn.rsp;
struct buffer *ib = *in, *ob = *out; struct buffer *ib = *in, *ob = *out;
@ -266,14 +266,13 @@ int http_compression_buffer_end(struct session *s, struct buffer **in, struct bu
to_forward = ob->i; to_forward = ob->i;
/* update input rate */ /* update input rate */
forwarded = ib->o - ob->o;
if (s->comp_ctx && s->comp_ctx->cur_lvl > 0) { if (s->comp_ctx && s->comp_ctx->cur_lvl > 0) {
update_freq_ctr(&global.comp_bps_in, forwarded); update_freq_ctr(&global.comp_bps_in, msg->next);
s->fe->fe_counters.comp_in += forwarded; s->fe->fe_counters.comp_in += msg->next;
s->be->be_counters.comp_in += forwarded; s->be->be_counters.comp_in += msg->next;
} else { } else {
s->fe->fe_counters.comp_byp += forwarded; s->fe->fe_counters.comp_byp += msg->next;
s->be->be_counters.comp_byp += forwarded; s->be->be_counters.comp_byp += msg->next;
} }
/* copy the remaining data in the tmp buffer. */ /* copy the remaining data in the tmp buffer. */