From 1d3dab497e98bba48b3056b9f373d2531a5bb089 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 23 Jul 2012 12:14:34 +0000 Subject: [PATCH] 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 --- STATUS | 7 ------- docs/conf/extra/httpd-default.conf.in | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/STATUS b/STATUS index 131815ea72..785df26142 100644 --- 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 f1e7bc82a7..7196922866 100644 --- 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 -- 2.50.1