Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 253:b6793bc5034b
nginx-0.0.2-2004-02-09-10:46:43 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 09 Feb 2004 07:46:43 +0000 |
parents | cd71b95716b4 |
children | 70e1c7d2b83d |
comparison
equal
deleted
inserted
replaced
252:84b1c672ec5a | 253:b6793bc5034b |
---|---|
1215 | 1215 |
1216 ngx_conf_merge_str_value(conf->default_type, | 1216 ngx_conf_merge_str_value(conf->default_type, |
1217 prev->default_type, "text/plain"); | 1217 prev->default_type, "text/plain"); |
1218 | 1218 |
1219 ngx_conf_merge_msec_value(conf->client_body_timeout, | 1219 ngx_conf_merge_msec_value(conf->client_body_timeout, |
1220 prev->client_body_timeout, 10000); | 1220 prev->client_body_timeout, 60000); |
1221 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); | 1221 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); |
1222 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); | 1222 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); |
1223 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 10000); | 1223 ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); |
1224 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); | 1224 ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); |
1225 ngx_conf_merge_size_value(conf->discarded_buffer_size, | 1225 ngx_conf_merge_size_value(conf->discarded_buffer_size, |
1226 prev->discarded_buffer_size, 1500); | 1226 prev->discarded_buffer_size, 1500); |
1227 ngx_conf_merge_msec_value(conf->keepalive_timeout, | 1227 ngx_conf_merge_msec_value(conf->keepalive_timeout, |
1228 prev->keepalive_timeout, 70000); | 1228 prev->keepalive_timeout, 70000); |