diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-08-02 12:43:01 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-08-02 12:43:01 +0000 |
| commit | 7cce1cacaace7133196cfc737a248471455f3855 (patch) | |
| tree | 02afd41cc613fde7cea28c6cf75a5e7472fde61f /src/http/ngx_http_core_module.c | |
| parent | 475a5dfcf1b42e4746cd344893c7a3980a45abac (diff) | |
| download | nginx-7cce1cacaace7133196cfc737a248471455f3855.tar.gz nginx-7cce1cacaace7133196cfc737a248471455f3855.tar.bz2 | |
fix typo introduced in r3985
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |