diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2020-04-22 15:48:39 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2020-04-22 15:48:39 +0300 |
| commit | 89bba9bf7ddf0cfe448e817f9215686fbfb1ae94 (patch) | |
| tree | eaaf67e8626b492337c5bfef97766920c218f824 /src/http/v3/ngx_http_v3_module.c | |
| parent | db90ddcb9ed847b101ebb794bfadcd3ef829147c (diff) | |
| download | nginx-89bba9bf7ddf0cfe448e817f9215686fbfb1ae94.tar.gz nginx-89bba9bf7ddf0cfe448e817f9215686fbfb1ae94.zip | |
HTTP/3: bytes holding directives changed to ngx_conf_set_size_slot.
This allows to specify directive values with measurement units.
Diffstat (limited to 'src/http/v3/ngx_http_v3_module.c')
| -rw-r--r-- | src/http/v3/ngx_http_v3_module.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/http/v3/ngx_http_v3_module.c b/src/http/v3/ngx_http_v3_module.c index 4b5f2f370..1566706fc 100644 --- a/src/http/v3/ngx_http_v3_module.c +++ b/src/http/v3/ngx_http_v3_module.c @@ -28,35 +28,35 @@ static ngx_command_t ngx_http_v3_commands[] = { { ngx_string("quic_max_packet_size"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, + ngx_conf_set_size_slot, NGX_HTTP_SRV_CONF_OFFSET, offsetof(ngx_http_v3_srv_conf_t, quic.max_packet_size), NULL }, { ngx_string("quic_initial_max_data"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, + ngx_conf_set_size_slot, NGX_HTTP_SRV_CONF_OFFSET, offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_data), NULL }, { ngx_string("quic_initial_max_stream_data_bidi_local"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, + ngx_conf_set_size_slot, NGX_HTTP_SRV_CONF_OFFSET, offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_stream_data_bidi_local), NULL }, { ngx_string("quic_initial_max_stream_data_bidi_remote"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, + ngx_conf_set_size_slot, NGX_HTTP_SRV_CONF_OFFSET, offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_stream_data_bidi_remote), NULL }, { ngx_string("quic_initial_max_stream_data_uni"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, - ngx_conf_set_num_slot, + ngx_conf_set_size_slot, NGX_HTTP_SRV_CONF_OFFSET, offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_stream_data_uni), NULL }, @@ -231,11 +231,11 @@ ngx_http_v3_create_srv_conf(ngx_conf_t *cf) v3cf->quic.max_idle_timeout = NGX_CONF_UNSET_MSEC; v3cf->quic.max_ack_delay = NGX_CONF_UNSET_MSEC; - v3cf->quic.max_packet_size = NGX_CONF_UNSET_UINT; - v3cf->quic.initial_max_data = NGX_CONF_UNSET_UINT; - v3cf->quic.initial_max_stream_data_bidi_local = NGX_CONF_UNSET_UINT; - v3cf->quic.initial_max_stream_data_bidi_remote = NGX_CONF_UNSET_UINT; - v3cf->quic.initial_max_stream_data_uni = NGX_CONF_UNSET_UINT; + v3cf->quic.max_packet_size = NGX_CONF_UNSET_SIZE; + v3cf->quic.initial_max_data = NGX_CONF_UNSET_SIZE; + v3cf->quic.initial_max_stream_data_bidi_local = NGX_CONF_UNSET_SIZE; + v3cf->quic.initial_max_stream_data_bidi_remote = NGX_CONF_UNSET_SIZE; + v3cf->quic.initial_max_stream_data_uni = NGX_CONF_UNSET_SIZE; v3cf->quic.initial_max_streams_bidi = NGX_CONF_UNSET_UINT; v3cf->quic.initial_max_streams_uni = NGX_CONF_UNSET_UINT; v3cf->quic.ack_delay_exponent = NGX_CONF_UNSET_UINT; @@ -266,7 +266,7 @@ ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } - ngx_conf_merge_uint_value(conf->quic.max_packet_size, + ngx_conf_merge_size_value(conf->quic.max_packet_size, prev->quic.max_packet_size, NGX_QUIC_DEFAULT_MAX_PACKET_SIZE); @@ -279,19 +279,19 @@ ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } - ngx_conf_merge_uint_value(conf->quic.initial_max_data, + ngx_conf_merge_size_value(conf->quic.initial_max_data, prev->quic.initial_max_data, 16 * NGX_QUIC_STREAM_BUFSIZE); - ngx_conf_merge_uint_value(conf->quic.initial_max_stream_data_bidi_local, + ngx_conf_merge_size_value(conf->quic.initial_max_stream_data_bidi_local, prev->quic.initial_max_stream_data_bidi_local, NGX_QUIC_STREAM_BUFSIZE); - ngx_conf_merge_uint_value(conf->quic.initial_max_stream_data_bidi_remote, + ngx_conf_merge_size_value(conf->quic.initial_max_stream_data_bidi_remote, prev->quic.initial_max_stream_data_bidi_remote, NGX_QUIC_STREAM_BUFSIZE); - ngx_conf_merge_uint_value(conf->quic.initial_max_stream_data_uni, + ngx_conf_merge_size_value(conf->quic.initial_max_stream_data_uni, prev->quic.initial_max_stream_data_uni, NGX_QUIC_STREAM_BUFSIZE); |