fix typo introduced in r3985

This commit is contained in:
Igor Sysoev 2011-08-02 12:43:01 +00:00
parent 475a5dfcf1
commit 7cce1cacaa

View File

@ -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);