Mercurial > hg > nginx
diff src/http/ngx_http_core_module.c @ 93:738fe44c70d5
nginx-0.0.1-2003-05-21-17:28:21 import
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 21 May 2003 13:28:21 +0000 |
| parents | 19cc647ecd91 |
| children | 8220378432a8 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -134,6 +134,13 @@ static ngx_command_t ngx_http_core_comm offsetof(ngx_http_core_loc_conf_t, send_timeout), NULL}, + {ngx_string("keepalive_timeout"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_msec_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_core_loc_conf_t, keepalive_timeout), + NULL}, + {ngx_string("lingering_time"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -912,6 +919,7 @@ static void *ngx_http_core_create_loc_co lcf->send_timeout = NGX_CONF_UNSET; lcf->discarded_buffer_size = NGX_CONF_UNSET; + lcf->keepalive_timeout = NGX_CONF_UNSET; lcf->lingering_time = NGX_CONF_UNSET; lcf->lingering_timeout = NGX_CONF_UNSET; @@ -981,6 +989,8 @@ static char *ngx_http_core_merge_loc_con ngx_conf_merge_size_value(conf->discarded_buffer_size, prev->discarded_buffer_size, 1500); + ngx_conf_merge_msec_value(conf->keepalive_timeout, prev->keepalive_timeout, + 70000); ngx_conf_merge_msec_value(conf->lingering_time, prev->lingering_time, 30000); ngx_conf_merge_msec_value(conf->lingering_timeout, prev->lingering_timeout,