RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-17 08:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: http: further cleanups of response forwarding function

Browse Source 
There is no reason for mixing compressing and non-compressing
code in the DATA state, they don't share anything. Better make
this clearer.
This commit is contained in:
Willy Tarreau 2014-04-21 10:54:27 +02:00
parent c623c17b13
commit d5a6783ac9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/proto_http.c
View File

@ -6227,17 +6227,19 @@ int http_response_forward_body(struct session *s, struct channel *res, int an_bi
if (ret < 0)
goto aborted_xfer;
if (res->to_forward || msg->chunk_len) {
res->flags |= CF_WAKE_WRITE;
if (msg->chunk_len) {
/* input empty or output full */
if (res->buf->i > msg->next)
res->flags |= CF_WAKE_WRITE;
goto missing_data;
}
}
if (msg->chunk_len > res->buf->i - msg->next) {
res->flags |= CF_WAKE_WRITE;
goto missing_data;
}
else {
if (msg->chunk_len > res->buf->i - msg->next) {
/* output full */
res->flags |= CF_WAKE_WRITE;
goto missing_data;
}
msg->next += msg->chunk_len;
msg->chunk_len = 0;
}