From 7cce1cacaace7133196cfc737a248471455f3855 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 2 Aug 2011 12:43:01 +0000 Subject: [PATCH] fix typo introduced in r3985 --- src/http/ngx_http_core_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index f7ebacb40..60aff8c3d 100644 --- 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 *cf, void *parent, void *child) 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);