You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/07/23 14:14:34 UTC
svn commit: r1364599 - in /httpd/httpd/branches/2.4.x: STATUS
docs/conf/extra/httpd-default.conf.in
Author: jim
Date: Mon Jul 23 12:14:34 2012
New Revision: 1364599
URL: http://svn.apache.org/viewvc?rev=1364599&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-default.conf.in
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1364599&r1=1364598&r2=1364599&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jul 23 12:14:34 2012
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-default.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-default.conf.in?rev=1364599&r1=1364598&r2=1364599&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-default.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-default.conf.in Mon Jul 23 12:14:34 2012
@@ -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