RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-25 04:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "MEDIUM: proto_htx: Switch to infinite forwarding if there is no data filter"

Browse Source 
This reverts commit f52170d2f4.

This commit was merged too early, some areas are not ready and
transfers from H1 to H2 often stall. Christopher suggested to wait
for the other parts to be ready before reintroducing it.
This commit is contained in:
Willy Tarreau 2019-03-21 18:00:30 +01:00
parent a56eebfa5d
commit 6e8d6a9163
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/proto_htx.c
View File

@ -1212,18 +1212,9 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
channel_auto_close(req);
if (req->to_forward) {
if (req->to_forward == CHN_INFINITE_FORWARD) {
if (req->flags & CF_SHUTR) {
msg->msg_state = HTTP_MSG_DONE;
req->to_forward = 0;
goto done;
}
}
else {
/* We can't process the buffer's contents yet */
req->flags |= CF_WAKE_WRITE;
goto missing_data_or_waiting;
}
/* We can't process the buffer's contents yet */
req->flags |= CF_WAKE_WRITE;
goto missing_data_or_waiting;
}
if (msg->msg_state >= HTTP_MSG_DONE)
@ -1242,8 +1233,14 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
}
else {
c_adv(req, htx->data - co_data(req));
if (msg->flags & HTTP_MSGF_XFER_LEN)
channel_htx_forward_forever(req, htx);
/* To let the function channel_forward work as expected we must update
* the channel's buffer to pretend there is no more input data. The
* right length is then restored. We must do that, because when an HTX
* message is stored into a buffer, it appears as full.
*/
if ((msg->flags & HTTP_MSGF_XFER_LEN) && htx->extra)
htx->extra -= channel_htx_forward(req, htx, htx->extra);
}
/* Check if the end-of-message is reached and if so, switch the message
@ -1253,7 +1250,6 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
goto missing_data_or_waiting;
msg->msg_state = HTTP_MSG_DONE;
req->to_forward = 0;
done:
/* other states, DONE...TUNNEL */
@ -2134,18 +2130,9 @@ int htx_response_forward_body(struct stream *s, struct channel *res, int an_bit)
channel_auto_close(res);
if (res->to_forward) {
if (res->to_forward == CHN_INFINITE_FORWARD) {
if (res->flags & CF_SHUTR) {
msg->msg_state = HTTP_MSG_DONE;
res->to_forward = 0;
goto done;
}
}
else {
/* We can't process the buffer's contents yet */
res->flags |= CF_WAKE_WRITE;
goto missing_data_or_waiting;
}
/* We can't process the buffer's contents yet */
res->flags |= CF_WAKE_WRITE;
goto missing_data_or_waiting;
}
if (msg->msg_state >= HTTP_MSG_DONE)
@ -2165,8 +2152,14 @@ int htx_response_forward_body(struct stream *s, struct channel *res, int an_bit)
}
else {
c_adv(res, htx->data - co_data(res));
if (msg->flags & HTTP_MSGF_XFER_LEN)
channel_htx_forward_forever(res, htx);
/* To let the function channel_forward work as expected we must update
* the channel's buffer to pretend there is no more input data. The
* right length is then restored. We must do that, because when an HTX
* message is stored into a buffer, it appears as full.
*/
if ((msg->flags & HTTP_MSGF_XFER_LEN) && htx->extra)
htx->extra -= channel_htx_forward(res, htx, htx->extra);
}
if (!(msg->flags & HTTP_MSGF_XFER_LEN)) {
@ -2184,7 +2177,6 @@ int htx_response_forward_body(struct stream *s, struct channel *res, int an_bit)
goto missing_data_or_waiting;
msg->msg_state = HTTP_MSG_DONE;
res->to_forward = 0;
done:
/* other states, DONE...TUNNEL */