mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: compression: does not forward trailers

Browse Source 
The commit bf3ae617 introduced a regression about the forward of the
trailers in compression mode.
This commit is contained in:
William Lallemand 2012-11-22 17:55:14 +01:00 committed by Willy Tarreau
parent fd29cc537b
commit 00bf1dee9c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compression.c
View File

@ -298,10 +298,6 @@ int http_compression_buffer_end(struct session *s, struct buffer **in, struct bu
/* forward the new chunk without remaining data */ /* forward the new chunk without remaining data */
b_adv(ob, to_forward); b_adv(ob, to_forward);
/* if there are data between p and next, there are trailers, must forward them */
b_adv(ob, msg->next);
msg->next = 0;
return to_forward; return to_forward;
} }

5
src/proto_http.c
View File

@ -5691,6 +5691,11 @@ int http_response_forward_body(struct session *s, struct channel *res, int an_bi
http_capture_bad_message(&s->be->invalid_rep, s, msg, HTTP_MSG_TRAILERS, s->fe); http_capture_bad_message(&s->be->invalid_rep, s, msg, HTTP_MSG_TRAILERS, s->fe);
goto return_bad_res; goto return_bad_res;
} }
if (s->comp_algo != NULL) {
/* forwarding trailers */
channel_forward(res, msg->next);
msg->next = 0;
}
/* we're in HTTP_MSG_DONE now */ /* we're in HTTP_MSG_DONE now */
} }
else { else {