commit 7af6b16936b630feabecbce0dbc9cf84b4943481
author Igor Sysoev <igor@sysoev.ru> Mon Feb 09 07:46:43 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Feb 09 07:46:43 2004 +0000
tree 18301d35a84907e66fe94ddc7600d4ec6d600409
parent 9260294400c902904cdf791c9c2e8fd069feec63

nginx-0.0.2-2004-02-09-10:46:43 import

src/http/ngx_http_core_module.c

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 53be384..ad5b3aa 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1217,10 +1217,10 @@
                              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);