Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2db7ec7658 | ||
|
|
f61d7e5c8e |
+1
-1
Submodule lib/boringssl updated: a1843d660b...d94be41723
+1
-1
Submodule lib/naxsi updated: 0521fb354b...1b712526ed
Submodule lib/nginx-http-flv-module updated: d978ffe81d...3274d539ef
+1
-1
Submodule lib/ngx_brotli updated: 659b4b3e16...a71f9312c2
+1
-1
Submodule lib/pcre updated: 80053ba153...a0b4ee097b
+1
-1
Submodule lib/zlib updated: d20bdfcd0e...d213e64378
@@ -349,6 +349,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
|
|||||||
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
|
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
|
||||||
|
|
||||||
h2c->blocked = 1;
|
h2c->blocked = 1;
|
||||||
|
h2c->new_streams = 0;
|
||||||
|
|
||||||
if (c->close) {
|
if (c->close) {
|
||||||
c->close = 0;
|
c->close = 0;
|
||||||
@@ -1286,6 +1287,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
|
|||||||
goto rst_stream;
|
goto rst_stream;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) {
|
||||||
|
ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
|
||||||
|
"client sent too many streams at once");
|
||||||
|
|
||||||
|
status = NGX_HTTP_V2_REFUSED_STREAM;
|
||||||
|
goto rst_stream;
|
||||||
|
}
|
||||||
|
|
||||||
if (!h2c->settings_ack
|
if (!h2c->settings_ack
|
||||||
&& !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
|
&& !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
|
||||||
&& h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
|
&& h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
|
||||||
@@ -1351,6 +1360,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
|
|||||||
|
|
||||||
rst_stream:
|
rst_stream:
|
||||||
|
|
||||||
|
if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) {
|
||||||
|
ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
|
||||||
|
"client sent too many refused streams");
|
||||||
|
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
|
if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
|
||||||
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
|
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -179,6 +179,8 @@ struct ngx_http_v2_connection_s {
|
|||||||
ngx_uint_t processing;
|
ngx_uint_t processing;
|
||||||
ngx_uint_t frames;
|
ngx_uint_t frames;
|
||||||
ngx_uint_t idle;
|
ngx_uint_t idle;
|
||||||
|
ngx_uint_t new_streams;
|
||||||
|
ngx_uint_t refused_streams;
|
||||||
ngx_uint_t priority_limit;
|
ngx_uint_t priority_limit;
|
||||||
|
|
||||||
size_t send_window;
|
size_t send_window;
|
||||||
|
|||||||
Reference in New Issue
Block a user