details: https://hg.nginx.org/nginx/rev/f790816a0e87
branches:
changeset: 7772:f790816a0e87
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu Feb 11 21:52:23 2021 +0300
description:
HTTP/2: removed http2_idle_timeout and http2_max_requests.

Instead, keepalive_timeout and keepalive_requests are now used. This
is expected to simplify HTTP/2 code and usage. This also matches
directives used by upstream module for all protocols.

In case of default settings, this effectively changes maximum number
of requests per connection from 1000 to 100. This looks acceptable,
especially given that HTTP/2 code now properly supports lingering close.

Further, this changes default keepalive timeout in HTTP/2 from 300 seconds
to 75 seconds. This also looks acceptable, and larger than PING interval
used by Firefox (network.http.spdy.ping-threshold defaults to 58s),
the only browser to use PINGs.

diffstat:

src/http/v2/ngx_http_v2.c | 41 ++++++++++++++++++++++++---------------
src/http/v2/ngx_http_v2_module.c | 31 +++++++++++++++--------------
src/http/v2/ngx_http_v2_module.h | 2 -
3 files changed, 41 insertions(+), 33 deletions(-)

diffs (192 lines):

diff -r 02be1baed382 -r f790816a0e87 src/http/v2/ngx_http_v2.c
--- a/src/http/v2/ngx_http_v2.c Thu Feb 11 21:52:20 2021 +0300
+++ b/src/http/v2/ngx_http_v2.c Thu Feb 11 21:52:23 2021 +0300
@@ -637,7 +637,7 @@ ngx_http_v2_handle_connection(ngx_http_v
{
ngx_int_t rc;
ngx_connection_t *c;
- ngx_http_v2_srv_conf_t *h2scf;
+ ngx_http_core_loc_conf_t *clcf;
ngx_http_core_srv_conf_t *cscf;

if (h2c->last_out || h2c->processing || h2c->pushing) {
@@ -709,10 +709,10 @@ ngx_http_v2_handle_connection(ngx_http_v
ngx_del_timer(c->write);
}

- h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
- ngx_http_v2_module);
-
- ngx_add_timer(c->read, h2scf->idle_timeout);
+ clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+ ngx_http_core_module);
+
+ ngx_add_timer(c->read, clcf->keepalive_timeout);
}


@@ -1200,12 +1200,14 @@ static u_char *
ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
u_char *end)
{
- size_t size;
- ngx_uint_t padded, priority, depend, dependency, excl, weight;
- ngx_uint_t status;
- ngx_http_v2_node_t *node;
- ngx_http_v2_stream_t *stream;
- ngx_http_v2_srv_conf_t *h2scf;
+ size_t size;
+ ngx_uint_t padded, priority, depend, dependency, excl,
+ weight;
+ ngx_uint_t status;
+ ngx_http_v2_node_t *node;
+ ngx_http_v2_stream_t *stream;
+ ngx_http_v2_srv_conf_t *h2scf;
+ ngx_http_core_loc_conf_t *clcf;

padded = h2c->state.flags & NGX_HTTP_V2_PADDED_FLAG;
priority = h2c->state.flags & NGX_HTTP_V2_PRIORITY_FLAG;
@@ -1364,7 +1366,10 @@ ngx_http_v2_state_headers(ngx_http_v2_co
ngx_http_v2_set_dependency(h2c, node, depend, excl);
}

- if (h2c->connection->requests >= h2scf->max_requests) {
+ clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+ ngx_http_core_module);
+
+ if (h2c->connection->requests >= clcf->keepalive_requests) {
h2c->goaway = 1;

if (ngx_http_v2_send_goaway(h2c, NGX_HTTP_V2_NO_ERROR) == NGX_ERROR) {
@@ -4659,6 +4664,7 @@ ngx_http_v2_idle_handler(ngx_event_t *re
ngx_connection_t *c;
ngx_http_v2_srv_conf_t *h2scf;
ngx_http_v2_connection_t *h2c;
+ ngx_http_core_loc_conf_t *clcf;

c = rev->data;
h2c = c->data;
@@ -4690,10 +4696,10 @@ ngx_http_v2_idle_handler(ngx_event_t *re

#endif

- h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
- ngx_http_v2_module);
-
- if (h2c->idle++ > 10 * h2scf->max_requests) {
+ clcf = ngx_http_get_module_loc_conf(h2c->http_connection->conf_ctx,
+ ngx_http_core_module);
+
+ if (h2c->idle++ > 10 * clcf->keepalive_requests) {
ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
"http2 flood detected");
ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR);
@@ -4707,6 +4713,9 @@ ngx_http_v2_idle_handler(ngx_event_t *re
ngx_del_timer(c->read);
}

+ h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
+ ngx_http_v2_module);
+
h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
if (h2c->pool == NULL) {
ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
diff -r 02be1baed382 -r f790816a0e87 src/http/v2/ngx_http_v2_module.c
--- a/src/http/v2/ngx_http_v2_module.c Thu Feb 11 21:52:20 2021 +0300
+++ b/src/http/v2/ngx_http_v2_module.c Thu Feb 11 21:52:23 2021 +0300
@@ -44,6 +44,14 @@ static ngx_conf_deprecated_t ngx_http_v
ngx_conf_deprecated, "http2_recv_timeout", "client_header_timeout"
};

+static ngx_conf_deprecated_t ngx_http_v2_idle_timeout_deprecated = {
+ ngx_conf_deprecated, "http2_idle_timeout", "keepalive_timeout"
+};
+
+static ngx_conf_deprecated_t ngx_http_v2_max_requests_deprecated = {
+ ngx_conf_deprecated, "http2_max_requests", "keepalive_requests"
+};
+

static ngx_conf_post_t ngx_http_v2_recv_buffer_size_post =
{ ngx_http_v2_recv_buffer_size };
@@ -89,10 +97,10 @@ static ngx_command_t ngx_http_v2_comman

{ ngx_string("http2_max_requests"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- NGX_HTTP_SRV_CONF_OFFSET,
- offsetof(ngx_http_v2_srv_conf_t, max_requests),
- NULL },
+ ngx_http_v2_obsolete,
+ 0,
+ 0,
+ &ngx_http_v2_max_requests_deprecated },

{ ngx_string("http2_max_field_size"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
@@ -131,10 +139,10 @@ static ngx_command_t ngx_http_v2_comman

{ ngx_string("http2_idle_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_msec_slot,
- NGX_HTTP_SRV_CONF_OFFSET,
- offsetof(ngx_http_v2_srv_conf_t, idle_timeout),
- NULL },
+ ngx_http_v2_obsolete,
+ 0,
+ 0,
+ &ngx_http_v2_idle_timeout_deprecated },

{ ngx_string("http2_chunk_size"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
@@ -302,7 +310,6 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *

h2scf->concurrent_streams = NGX_CONF_UNSET_UINT;
h2scf->concurrent_pushes = NGX_CONF_UNSET_UINT;
- h2scf->max_requests = NGX_CONF_UNSET_UINT;

h2scf->max_field_size = NGX_CONF_UNSET_SIZE;
h2scf->max_header_size = NGX_CONF_UNSET_SIZE;
@@ -311,8 +318,6 @@ ngx_http_v2_create_srv_conf(ngx_conf_t *

h2scf->streams_index_mask = NGX_CONF_UNSET_UINT;

- h2scf->idle_timeout = NGX_CONF_UNSET_MSEC;
-
return h2scf;
}

@@ -329,7 +334,6 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *c
prev->concurrent_streams, 128);
ngx_conf_merge_uint_value(conf->concurrent_pushes,
prev->concurrent_pushes, 10);
- ngx_conf_merge_uint_value(conf->max_requests, prev->max_requests, 1000);

ngx_conf_merge_size_value(conf->max_field_size, prev->max_field_size,
4096);
@@ -341,9 +345,6 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *c
ngx_conf_merge_uint_value(conf->streams_index_mask,
prev->streams_index_mask, 32 - 1);

- ngx_conf_merge_msec_value(conf->idle_timeout,
- prev->idle_timeout, 180000);
-
return NGX_CONF_OK;
}

diff -r 02be1baed382 -r f790816a0e87 src/http/v2/ngx_http_v2_module.h
--- a/src/http/v2/ngx_http_v2_module.h Thu Feb 11 21:52:20 2021 +0300
+++ b/src/http/v2/ngx_http_v2_module.h Thu Feb 11 21:52:23 2021 +0300
@@ -24,12 +24,10 @@ typedef struct {
size_t pool_size;
ngx_uint_t concurrent_streams;
ngx_uint_t concurrent_pushes;
- ngx_uint_t max_requests;
size_t max_field_size;
size_t max_header_size;
size_t preread_size;
ngx_uint_t streams_index_mask;
- ngx_msec_t idle_timeout;
} ngx_http_v2_srv_conf_t;


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel