# HG changeset patch # User Roman Arutyunyan # Date 1628087711 -10800 # Node ID 4f922f61113587815ebf5d5d5bf164bbd3336d79 # Parent a9f6540e61da53b926cbcee3f78a822ac8f137c3 HTTP/3: replaced macros with values. diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h --- a/src/http/v3/ngx_http_v3.h +++ b/src/http/v3/ngx_http_v3.h @@ -50,11 +50,6 @@ #define NGX_HTTP_V3_STREAM_SERVER_DECODER 5 #define NGX_HTTP_V3_MAX_KNOWN_STREAM 6 -#define NGX_HTTP_V3_DEFAULT_MAX_TABLE_CAPACITY 16384 -#define NGX_HTTP_V3_DEFAULT_MAX_BLOCKED_STREAMS 16 -#define NGX_HTTP_V3_DEFAULT_MAX_CONCURRENT_PUSHES 10 -#define NGX_HTTP_V3_DEFAULT_MAX_UNI_STREAMS 3 - /* HTTP/3 errors */ #define NGX_HTTP_V3_ERR_NO_ERROR 0x100 #define NGX_HTTP_V3_ERR_GENERAL_PROTOCOL_ERROR 0x101 diff --git a/src/http/v3/ngx_http_v3_module.c b/src/http/v3/ngx_http_v3_module.c --- a/src/http/v3/ngx_http_v3_module.c +++ b/src/http/v3/ngx_http_v3_module.c @@ -124,20 +124,16 @@ ngx_http_v3_merge_srv_conf(ngx_conf_t *c ngx_http_v3_srv_conf_t *conf = child; ngx_conf_merge_size_value(conf->max_table_capacity, - prev->max_table_capacity, - NGX_HTTP_V3_DEFAULT_MAX_TABLE_CAPACITY); + prev->max_table_capacity, 16384); ngx_conf_merge_uint_value(conf->max_blocked_streams, - prev->max_blocked_streams, - NGX_HTTP_V3_DEFAULT_MAX_BLOCKED_STREAMS); + prev->max_blocked_streams, 16); ngx_conf_merge_uint_value(conf->max_concurrent_pushes, - prev->max_concurrent_pushes, - NGX_HTTP_V3_DEFAULT_MAX_CONCURRENT_PUSHES); + prev->max_concurrent_pushes, 10); ngx_conf_merge_uint_value(conf->max_uni_streams, - prev->max_uni_streams, - NGX_HTTP_V3_DEFAULT_MAX_UNI_STREAMS); + prev->max_uni_streams, 3); return NGX_CONF_OK; }