Mercurial > hg > nginx-quic
comparison src/http/ngx_http_core_module.c @ 3984:3e51832c8215
lingering_close "off|on|always"
patch by Maxim Dounin
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 01 Aug 2011 13:26:55 +0000 |
parents | aab3889c41e9 |
children | 6c4d2d163611 |
comparison
equal
deleted
inserted
replaced
3983:e126d997cbc6 | 3984:3e51832c8215 |
---|---|
124 { ngx_string("any"), NGX_HTTP_SATISFY_ANY }, | 124 { ngx_string("any"), NGX_HTTP_SATISFY_ANY }, |
125 { ngx_null_string, 0 } | 125 { ngx_null_string, 0 } |
126 }; | 126 }; |
127 | 127 |
128 | 128 |
129 static ngx_conf_enum_t ngx_http_core_lingering_close[] = { | |
130 { ngx_string("off"), NGX_HTTP_LINGERING_OFF }, | |
131 { ngx_string("on"), NGX_HTTP_LINGERING_ON }, | |
132 { ngx_string("always"), NGX_HTTP_LINGERING_ALWAYS }, | |
133 { ngx_null_string, 0 } | |
134 }; | |
135 | |
136 | |
129 static ngx_conf_enum_t ngx_http_core_if_modified_since[] = { | 137 static ngx_conf_enum_t ngx_http_core_if_modified_since[] = { |
130 { ngx_string("off"), NGX_HTTP_IMS_OFF }, | 138 { ngx_string("off"), NGX_HTTP_IMS_OFF }, |
131 { ngx_string("exact"), NGX_HTTP_IMS_EXACT }, | 139 { ngx_string("exact"), NGX_HTTP_IMS_EXACT }, |
132 { ngx_string("before"), NGX_HTTP_IMS_BEFORE }, | 140 { ngx_string("before"), NGX_HTTP_IMS_BEFORE }, |
133 { ngx_null_string, 0 } | 141 { ngx_null_string, 0 } |
528 NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS, | 536 NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS, |
529 ngx_http_core_internal, | 537 ngx_http_core_internal, |
530 NGX_HTTP_LOC_CONF_OFFSET, | 538 NGX_HTTP_LOC_CONF_OFFSET, |
531 0, | 539 0, |
532 NULL }, | 540 NULL }, |
541 | |
542 { ngx_string("lingering_close"), | |
543 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
544 ngx_conf_set_enum_slot, | |
545 NGX_HTTP_LOC_CONF_OFFSET, | |
546 offsetof(ngx_http_core_loc_conf_t, lingering_close), | |
547 &ngx_http_core_lingering_close }, | |
533 | 548 |
534 { ngx_string("lingering_time"), | 549 { ngx_string("lingering_time"), |
535 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 550 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
536 ngx_conf_set_msec_slot, | 551 ngx_conf_set_msec_slot, |
537 NGX_HTTP_LOC_CONF_OFFSET, | 552 NGX_HTTP_LOC_CONF_OFFSET, |
3248 clcf->limit_rate = NGX_CONF_UNSET_SIZE; | 3263 clcf->limit_rate = NGX_CONF_UNSET_SIZE; |
3249 clcf->limit_rate_after = NGX_CONF_UNSET_SIZE; | 3264 clcf->limit_rate_after = NGX_CONF_UNSET_SIZE; |
3250 clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; | 3265 clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; |
3251 clcf->keepalive_header = NGX_CONF_UNSET; | 3266 clcf->keepalive_header = NGX_CONF_UNSET; |
3252 clcf->keepalive_requests = NGX_CONF_UNSET_UINT; | 3267 clcf->keepalive_requests = NGX_CONF_UNSET_UINT; |
3268 clcf->lingering_close = NGX_CONF_UNSET_UINT; | |
3253 clcf->lingering_time = NGX_CONF_UNSET_MSEC; | 3269 clcf->lingering_time = NGX_CONF_UNSET_MSEC; |
3254 clcf->lingering_timeout = NGX_CONF_UNSET_MSEC; | 3270 clcf->lingering_timeout = NGX_CONF_UNSET_MSEC; |
3255 clcf->resolver_timeout = NGX_CONF_UNSET_MSEC; | 3271 clcf->resolver_timeout = NGX_CONF_UNSET_MSEC; |
3256 clcf->reset_timedout_connection = NGX_CONF_UNSET; | 3272 clcf->reset_timedout_connection = NGX_CONF_UNSET; |
3257 clcf->server_name_in_redirect = NGX_CONF_UNSET; | 3273 clcf->server_name_in_redirect = NGX_CONF_UNSET; |
3464 prev->keepalive_timeout, 75000); | 3480 prev->keepalive_timeout, 75000); |
3465 ngx_conf_merge_sec_value(conf->keepalive_header, | 3481 ngx_conf_merge_sec_value(conf->keepalive_header, |
3466 prev->keepalive_header, 0); | 3482 prev->keepalive_header, 0); |
3467 ngx_conf_merge_uint_value(conf->keepalive_requests, | 3483 ngx_conf_merge_uint_value(conf->keepalive_requests, |
3468 prev->keepalive_requests, 100); | 3484 prev->keepalive_requests, 100); |
3485 ngx_conf_merge_msec_value(conf->lingering_close, | |
3486 prev->lingering_close, NGX_HTTP_LINGERING_ON); | |
3469 ngx_conf_merge_msec_value(conf->lingering_time, | 3487 ngx_conf_merge_msec_value(conf->lingering_time, |
3470 prev->lingering_time, 30000); | 3488 prev->lingering_time, 30000); |
3471 ngx_conf_merge_msec_value(conf->lingering_timeout, | 3489 ngx_conf_merge_msec_value(conf->lingering_timeout, |
3472 prev->lingering_timeout, 5000); | 3490 prev->lingering_timeout, 5000); |
3473 ngx_conf_merge_msec_value(conf->resolver_timeout, | 3491 ngx_conf_merge_msec_value(conf->resolver_timeout, |