summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/manual/mod/core.xml2
-rw-r--r--include/httpd.h2
2 files changed, 2 insertions, 2 deletions
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 */