Mercurial > hg > nginx

comparison src/http/v3/ngx_http_v3_module.c @ 8922:be08b858086a quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/3: http3_hq directive and NGX_HTTP_V3_HQ macro. Listen quic parameter is no longer supported.
author Roman Arutyunyan <arut@nginx.com>
date Sat, 04 Dec 2021 10:52:55 +0300
parents 33226ac61076
children 651cc905b7c2
comparison
equal deleted inserted replaced
8921:33226ac61076 8922:be08b858086a
66 ngx_conf_set_num_slot, 66 ngx_conf_set_num_slot,
67 NGX_HTTP_SRV_CONF_OFFSET, 67 NGX_HTTP_SRV_CONF_OFFSET,
68 offsetof(ngx_http_v3_srv_conf_t, max_uni_streams), 68 offsetof(ngx_http_v3_srv_conf_t, max_uni_streams),
69 NULL }, 69 NULL },
70 70
71 #if (NGX_HTTP_V3_HQ)
72 { ngx_string("http3_hq"),
73 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
74 ngx_conf_set_flag_slot,
75 NGX_HTTP_SRV_CONF_OFFSET,
76 offsetof(ngx_http_v3_srv_conf_t, hq),
77 NULL },
78 #endif
79
71 { ngx_string("http3_push"), 80 { ngx_string("http3_push"),
72 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 81 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
73 ngx_http_v3_push, 82 ngx_http_v3_push,
74 NGX_HTTP_LOC_CONF_OFFSET, 83 NGX_HTTP_LOC_CONF_OFFSET,
75 0, 84 0,
298 307
299 h3scf->max_table_capacity = NGX_CONF_UNSET_SIZE; 308 h3scf->max_table_capacity = NGX_CONF_UNSET_SIZE;
300 h3scf->max_blocked_streams = NGX_CONF_UNSET_UINT; 309 h3scf->max_blocked_streams = NGX_CONF_UNSET_UINT;
301 h3scf->max_concurrent_pushes = NGX_CONF_UNSET_UINT; 310 h3scf->max_concurrent_pushes = NGX_CONF_UNSET_UINT;
302 h3scf->max_uni_streams = NGX_CONF_UNSET_UINT; 311 h3scf->max_uni_streams = NGX_CONF_UNSET_UINT;
312 #if (NGX_HTTP_V3_HQ)
313 h3scf->hq = NGX_CONF_UNSET;
314 #endif
303 315
304 h3scf->quic.tp.max_idle_timeout = NGX_CONF_UNSET_MSEC; 316 h3scf->quic.tp.max_idle_timeout = NGX_CONF_UNSET_MSEC;
305 h3scf->quic.tp.max_ack_delay = NGX_CONF_UNSET_MSEC; 317 h3scf->quic.tp.max_ack_delay = NGX_CONF_UNSET_MSEC;
306 h3scf->quic.tp.max_udp_payload_size = NGX_CONF_UNSET_SIZE; 318 h3scf->quic.tp.max_udp_payload_size = NGX_CONF_UNSET_SIZE;
307 h3scf->quic.tp.initial_max_data = NGX_CONF_UNSET_SIZE; 319 h3scf->quic.tp.initial_max_data = NGX_CONF_UNSET_SIZE;
341 prev->max_concurrent_pushes, 10); 353 prev->max_concurrent_pushes, 10);
342 354
343 ngx_conf_merge_uint_value(conf->max_uni_streams, 355 ngx_conf_merge_uint_value(conf->max_uni_streams,
344 prev->max_uni_streams, 3); 356 prev->max_uni_streams, 3);
345 357
358 #if (NGX_HTTP_V3_HQ)
359 ngx_conf_merge_value(conf->hq, prev->hq, 0);
360 #endif
361
346 ngx_conf_merge_msec_value(conf->quic.tp.max_idle_timeout, 362 ngx_conf_merge_msec_value(conf->quic.tp.max_idle_timeout,
347 prev->quic.tp.max_idle_timeout, 60000); 363 prev->quic.tp.max_idle_timeout, 60000);
348 364
349 ngx_conf_merge_msec_value(conf->quic.tp.max_ack_delay, 365 ngx_conf_merge_msec_value(conf->quic.tp.max_ack_delay,
350 prev->quic.tp.max_ack_delay, 366 prev->quic.tp.max_ack_delay,