RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: proto-htx: Not forward too much data when 1xx reponses are handled 

When an 1xx reponse is processed, we forward it immediatly. But another message
may already be in the channel's buffer, waiting to be processed. This may be
another 1xx reponse or the final one. So instead of forwarding everything, we
must take care to only forward the processed 1xx response.

This patch must be backported to 1.9.
This commit is contained in:
Christopher Faulet 2019-05-17 09:58:45 +02:00
parent 8e9e3ef15c
commit f90c24d14c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/proto_htx.c
View File

@ -1716,8 +1716,17 @@ int htx_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
*/
if (txn->status < 200 &&
(txn->status == 100 || txn->status >= 102)) {
int32_t pos;
FLT_STRM_CB(s, flt_http_reset(s, msg));
c_adv(rep, htx->data);
for (pos = htx_get_head(htx); pos != -1; pos = htx_get_next(htx, pos)) {
struct htx_blk *blk = htx_get_blk(htx, pos);
enum htx_blk_type type = htx_get_blk_type(blk);
c_adv(rep, htx_get_blksz(blk));
if (type == HTX_BLK_EOM)
break;
}
msg->msg_state = HTTP_MSG_RPBEFORE;
txn->status = 0;
s->logs.t_data = -1; /* was not a response yet */