Mercurial > hg > nginx
diff 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 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1217,10 +1217,10 @@ static char *ngx_http_core_merge_loc_con prev->default_type, "text/plain"); ngx_conf_merge_msec_value(conf->client_body_timeout, - prev->client_body_timeout, 10000); + prev->client_body_timeout, 60000); ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); - ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 10000); + ngx_conf_merge_msec_value(conf->send_timeout, prev->send_timeout, 60000); ngx_conf_merge_size_value(conf->send_lowat, prev->send_lowat, 0); ngx_conf_merge_size_value(conf->discarded_buffer_size, prev->discarded_buffer_size, 1500);