mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 20:53:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP/2: refuse streams with data until SETTINGS is acknowledged.

Browse Source 
A client is allowed to send requests before receiving and acknowledging
the SETTINGS frame.  Such a client having a wrong idea about the stream's
could send the request body that nginx isn't ready to process.

The previous behavior was to send RST_STREAM with FLOW_CONTROL_ERROR in
such case, but it didn't allow retrying requests that have been rejected.
This commit is contained in:
Valentin Bartenev 2016-04-14 15:14:15 +03:00
parent 60f0960ab6
commit 536b5510d1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http/v2/ngx_http_v2.c
View File

@ -1058,6 +1058,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
goto rst_stream; goto rst_stream;
} }
if (!h2c->settings_ack && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG))
{
status = NGX_HTTP_V2_REFUSED_STREAM;
goto rst_stream;
}
node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1); node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1);
if (node == NULL) { if (node == NULL) {
@ -1878,7 +1884,7 @@ ngx_http_v2_state_settings(ngx_http_v2_connection_t *h2c, u_char *pos,
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR); return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
} }
/* TODO settings acknowledged */ h2c->settings_ack = 1;
return ngx_http_v2_state_complete(h2c, pos, end); return ngx_http_v2_state_complete(h2c, pos, end);
} }

1
src/http/v2/ngx_http_v2.h
View File

@ -141,6 +141,7 @@ struct ngx_http_v2_connection_s {
ngx_uint_t last_sid; ngx_uint_t last_sid;
unsigned closed_nodes:8; unsigned closed_nodes:8;
unsigned settings_ack:1;
unsigned blocked:1; unsigned blocked:1;
}; };