From: Jim Jagielski <jim@apache.org>
Date: Tue, 8 Nov 2011 22:07:58 +0000 (+0000)
Subject: Change def timeout from a nasty 5 mins to a more reasonable 1min
X-Git-Tag: 2.3.15~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59066a3ff3d2548514b12716ac76bd60f61d1275;p=apache

Change def timeout from a nasty 5 mins to a more reasonable 1min

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199485 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 1469efbe85..a9e9866feb 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -4081,7 +4081,7 @@ server</description>
 <description>Amount of time the server will wait for
 certain events before failing a request</description>
 <syntax>TimeOut <var>seconds</var></syntax>
-<default>TimeOut 300</default>
+<default>TimeOut 60</default>
 <contextlist><context>server config</context><context>virtual host</context></contextlist>
 
 <usage>
diff --git a/include/httpd.h b/include/httpd.h
index 89f91059bb..464f4a1286 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -156,7 +156,7 @@ extern "C" {
 
 /** The timeout for waiting for messages */
 #ifndef DEFAULT_TIMEOUT
-#define DEFAULT_TIMEOUT 300
+#define DEFAULT_TIMEOUT 60
 #endif
 
 /** The timeout for waiting for keepalive timeout until next request */