HTTP/3: replaced macros with values.

diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h
index bea560864fb331ba24b1a4d2f85db6a04dd8ea3a..9076b6ff5eba7b90239ae6007c5fa79b4af868be 100644 (file)
--- 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
index 873ebb2f3d735b4dcedd3aac3953b57630aa789a..4b59b097ca12ae78ebfe9fa75f62d6dc5ae5bcf9 100644 (file)
--- 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 *cf, void *parent, void *child)
     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;
 }