RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-19 12:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Because in HTX the parsing is done by the multiplexers, there is no reason to
limit the amount of data fast-forwarded. Of course, it is only true when there
is no data filter registered on the corresponding channel. So now, we enable the
infinite forwarding when possible. However, the HTTP message state remains
HTTP_MSG_DATA. Then, when infinite forwarding is enabled, if the flag CF_SHUTR
is set, the state is switched to HTTP_MSG_DONE.
This commit is contained in:
Christopher Faulet 2019-03-08 15:45:26 +01:00 committed by Willy Tarreau
parent 679bba13f7
commit f52170d2f4
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/proto_htx.c
View File

@ -1222,9 +1222,18 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
channel_auto_close(req);
if (req->to_forward) {
/* We can't process the buffer's contents yet */
req->flags |= CF_WAKE_WRITE;
goto missing_data_or_waiting;
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;
}
}
if (msg->msg_state >= HTTP_MSG_DONE)
@ -1243,14 +1252,8 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
}
else {
c_adv(req, htx->data - co_data(req));
/* 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);
if (msg->flags & HTTP_MSGF_XFER_LEN)
channel_htx_forward_forever(req, htx);
}
/* Check if the end-of-message is reached and if so, switch the message
@ -1260,6 +1263,7 @@ 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 */
@ -2140,9 +2144,18 @@ int htx_response_forward_body(struct stream *s, struct channel *res, int an_bit)
channel_auto_close(res);
if (res->to_forward) {
/* We can't process the buffer's contents yet */
res->flags |= CF_WAKE_WRITE;
goto missing_data_or_waiting;
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;
}
}
if (msg->msg_state >= HTTP_MSG_DONE)
@ -2162,14 +2175,8 @@ int htx_response_forward_body(struct stream *s, struct channel *res, int an_bit)
}
else {
c_adv(res, htx->data - co_data(res));
/* 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)
channel_htx_forward_forever(res, htx);
}
if (!(msg->flags & HTTP_MSGF_XFER_LEN)) {
@ -2187,6 +2194,7 @@ 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 */