Mercurial > hg > nginx-quic
changeset 3990:3165250f6c16
fix typo introduced in r3985
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 02 Aug 2011 12:43:01 +0000 |
parents | 806153a80cf5 |
children | 509db6c0c5dc |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3482,7 +3482,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t prev->keepalive_header, 0); ngx_conf_merge_uint_value(conf->keepalive_requests, prev->keepalive_requests, 100); - ngx_conf_merge_msec_value(conf->lingering_close, + ngx_conf_merge_uint_value(conf->lingering_close, prev->lingering_close, NGX_HTTP_LINGERING_ON); ngx_conf_merge_msec_value(conf->lingering_time, prev->lingering_time, 30000);