Skip to content

HTTP/2: per-iteration stream handling limit. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghen2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HTTP/2: per-iteration stream handling limit. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/http/v2/ngx_http_v2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ ngx_http_v2_read_handler(ngx_event_t *rev)
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");

h2c->blocked = 1;
h2c->new_streams = 0;

if (c->close) {
c->close = 0;
Expand Down Expand Up @@ -1320,6 +1321,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
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
&& !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
&& h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
Expand Down Expand Up @@ -1385,6 +1394,12 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,

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) {
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
}
Expand Down
2 changes: 2 additions & 0 deletions src/http/v2/ngx_http_v2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ struct ngx_http_v2_connection_s {
ngx_uint_t processing;
ngx_uint_t frames;
ngx_uint_t idle;
ngx_uint_t new_streams;
ngx_uint_t refused_streams;
ngx_uint_t priority_limit;

ngx_uint_t pushing;
Expand Down