CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-08-27 04:07:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

HTTP/2: don't send WINDOW_UPDATE for an empty request body.

Browse source 
Particularly this prevents sending WINDOW_UPDATE with zero delta
which can result in PROTOCOL_ERROR.

Also removed surplus setting of no_flow_control to 0.
This commit is contained in:
Valentin Bartenev 2016-04-19 17:38:49 +03:00
parent eeb72127cf
commit f4df08b19d
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/http/v2/ngx_http_v2.c
View file

@ -3481,20 +3481,21 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r,
return ngx_http_v2_process_request_body(r, NULL, 0, 1);
}
if (r->request_body_no_buffering) {
stream->no_flow_control = 0;
stream->recv_window = (size_t) len;
if (len) {
if (r->request_body_no_buffering) {
stream->recv_window = (size_t) len;
} else {
stream->no_flow_control = 1;
stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
}
} else {
stream->no_flow_control = 1;
stream->recv_window = NGX_HTTP_V2_MAX_WINDOW;
}
if (ngx_http_v2_send_window_update(stream->connection, stream->node->id,
stream->recv_window)
== NGX_ERROR)
{
return NGX_HTTP_INTERNAL_SERVER_ERROR;
if (ngx_http_v2_send_window_update(stream->connection, stream->node->id,
stream->recv_window)
== NGX_ERROR)
{
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
}
ngx_add_timer(r->connection->read, clcf->client_body_timeout);