Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3990:3165250f6c16
fix typo introduced in r3985
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 02 Aug 2011 12:43:01 +0000 |
parents | 6c4d2d163611 |
children | f77ed914eb1d |
comparison
equal
deleted
inserted
replaced
3989:806153a80cf5 | 3990:3165250f6c16 |
---|---|
3480 prev->keepalive_timeout, 75000); | 3480 prev->keepalive_timeout, 75000); |
3481 ngx_conf_merge_sec_value(conf->keepalive_header, | 3481 ngx_conf_merge_sec_value(conf->keepalive_header, |
3482 prev->keepalive_header, 0); | 3482 prev->keepalive_header, 0); |
3483 ngx_conf_merge_uint_value(conf->keepalive_requests, | 3483 ngx_conf_merge_uint_value(conf->keepalive_requests, |
3484 prev->keepalive_requests, 100); | 3484 prev->keepalive_requests, 100); |
3485 ngx_conf_merge_msec_value(conf->lingering_close, | 3485 ngx_conf_merge_uint_value(conf->lingering_close, |
3486 prev->lingering_close, NGX_HTTP_LINGERING_ON); | 3486 prev->lingering_close, NGX_HTTP_LINGERING_ON); |
3487 ngx_conf_merge_msec_value(conf->lingering_time, | 3487 ngx_conf_merge_msec_value(conf->lingering_time, |
3488 prev->lingering_time, 30000); | 3488 prev->lingering_time, 30000); |
3489 ngx_conf_merge_msec_value(conf->lingering_timeout, | 3489 ngx_conf_merge_msec_value(conf->lingering_timeout, |
3490 prev->lingering_timeout, 5000); | 3490 prev->lingering_timeout, 5000); |