Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 93:738fe44c70d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
92:19cc647ecd91 93:738fe44c70d5
130 {ngx_string("send_timeout"), 130 {ngx_string("send_timeout"),
131 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 131 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
132 ngx_conf_set_msec_slot, 132 ngx_conf_set_msec_slot,
133 NGX_HTTP_LOC_CONF_OFFSET, 133 NGX_HTTP_LOC_CONF_OFFSET,
134 offsetof(ngx_http_core_loc_conf_t, send_timeout), 134 offsetof(ngx_http_core_loc_conf_t, send_timeout),
135 NULL},
136
137 {ngx_string("keepalive_timeout"),
138 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
139 ngx_conf_set_msec_slot,
140 NGX_HTTP_LOC_CONF_OFFSET,
141 offsetof(ngx_http_core_loc_conf_t, keepalive_timeout),
135 NULL}, 142 NULL},
136 143
137 {ngx_string("lingering_time"), 144 {ngx_string("lingering_time"),
138 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 145 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
139 ngx_conf_set_msec_slot, 146 ngx_conf_set_msec_slot,
910 917
911 lcf->sendfile = NGX_CONF_UNSET; 918 lcf->sendfile = NGX_CONF_UNSET;
912 919
913 lcf->send_timeout = NGX_CONF_UNSET; 920 lcf->send_timeout = NGX_CONF_UNSET;
914 lcf->discarded_buffer_size = NGX_CONF_UNSET; 921 lcf->discarded_buffer_size = NGX_CONF_UNSET;
922 lcf->keepalive_timeout = NGX_CONF_UNSET;
915 lcf->lingering_time = NGX_CONF_UNSET; 923 lcf->lingering_time = NGX_CONF_UNSET;
916 lcf->lingering_timeout = NGX_CONF_UNSET; 924 lcf->lingering_timeout = NGX_CONF_UNSET;
917 925
918 return lcf; 926 return lcf;
919 } 927 }
979 987
980 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 10000); 988 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 10000);
981 989
982 ngx_conf_merge_size_value(conf->discarded_buffer_size, 990 ngx_conf_merge_size_value(conf->discarded_buffer_size,
983 prev->discarded_buffer_size, 1500); 991 prev->discarded_buffer_size, 1500);
992 ngx_conf_merge_msec_value(conf->keepalive_timeout, prev->keepalive_timeout,
993 70000);
984 ngx_conf_merge_msec_value(conf->lingering_time, prev->lingering_time, 994 ngx_conf_merge_msec_value(conf->lingering_time, prev->lingering_time,
985 30000); 995 30000);
986 ngx_conf_merge_msec_value(conf->lingering_timeout, prev->lingering_timeout, 996 ngx_conf_merge_msec_value(conf->lingering_timeout, prev->lingering_timeout,
987 5000); 997 5000);
988 998