Merge r1306350 from trunk:

Adapt Timeout to be the same as DEFAULT_TIMEOUT.
After all it's localted in a file called extra/httpd-default.conf

Submitted by: igalic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364599 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 131815ea72516ffbdc338cdf7a56adfafe623133..785df26142ea5df68b22b3b211185ab322bbc045 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -142,13 +142,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: rjung, humbedooh, jim
 
-   * core config: Set Timeout in httpd-default.conf to same value as
-     the code default (change from 300s to 60s)
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1306350
-     2.4.x patch: trunk patch works
-     +1: rjung, humbedooh, jim
-     rjung: igalic: you applied it to trunk, care to vote?
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/docs/conf/extra/httpd-default.conf.in b/docs/conf/extra/httpd-default.conf.in
index f1e7bc82a7715ba7d62655cfaccfdcf0a361584d..7196922866a03aba236fdb0224a0bfc7714661bc 100644 (file)
--- a/docs/conf/extra/httpd-default.conf.in
+++ b/docs/conf/extra/httpd-default.conf.in
@@ -7,7 +7,7 @@
 #
 # Timeout: The number of seconds before receives and sends time out.
 #
-Timeout 300
+Timeout 60
 
 #
 # KeepAlive: Whether or not to allow persistent connections (more than