Return-Path: 
 <cvs-return-39929-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9D7719348
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Tue,  8 Nov 2011 22:08:22 +0000 (UTC)
Received: (qmail 64481 invoked by uid 500); 8 Nov 2011 22:08:22 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 64422 invoked by uid 500); 8 Nov 2011 22:08:22 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 64410 invoked by uid 99); 8 Nov 2011 22:08:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 22:08:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 22:08:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id DA3AB23888EA;
	Tue,  8 Nov 2011 22:07:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1199485 - in /httpd/httpd/trunk:
 docs/manual/mod/core.xml
 include/httpd.h
Date: Tue, 08 Nov 2011 22:07:58 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111108220758.DA3AB23888EA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jim
Date: Tue Nov  8 22:07:58 2011
New Revision: 1199485

URL: http://svn.apache.org/viewvc?rev=1199485&view=rev
Log:
Change def timeout from a nasty 5 mins to a more reasonable 1min

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.xml
    httpd/httpd/trunk/include/httpd.h

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=1199485&r1=1199484&r2=1199485&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Tue Nov  8 22:07:58 2011
@@ -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>

Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1199485&r1=1199484&r2=1199485&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Tue Nov  8 22:07:58 2011
@@ -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 */