marc 97/02/16 14:48:27
Modified: conf httpd.conf-dist
htdocs/manual/mod core.html
src CHANGES httpd.h
Log:
Reduce default timeout to 300 seconds all around. Not reduced further
because there are still likely some odd snippets of code that don't
properly reset the timer.
Reviewed by: Dean Gaudet, Jim Jagielski, Randy Terbush
Revision Changes Path
1.11 +1 -2 /export/home/cvs/apache/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /export/home/cvs/apache/conf/httpd.conf-dist,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** httpd.conf-dist 1997/01/26 01:19:14 1.10
--- httpd.conf-dist 1997/02/16 22:48:22 1.11
***************
*** 87,95 ****
#CacheNegotiatedDocs
# Timeout: The number of seconds before receives and sends time out
- # n.b. the compiled default is 1200 (20 minutes !)
! Timeout 400
# KeepAlive: Whether or not to allow persistent connections (more than
# one request per connection). Set to "Off" to deactivate.
--- 87,94 ----
#CacheNegotiatedDocs
# Timeout: The number of seconds before receives and sends time out
! Timeout 300
# KeepAlive: Whether or not to allow persistent connections (more than
# one request per connection). Set to "Off" to deactivate.
1.35 +6 -4 /export/home/cvs/apache/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -C3 -r1.34 -r1.35
*** core.html 1997/02/03 02:50:54 1.34
--- core.html 1997/02/16 22:48:23 1.35
***************
*** 1146,1152 ****
<A name="timeout"><h2>TimeOut directive</h2></A>
<!--%plaintext <?INDEX {\tt TimeOut} directive> -->
<strong>Syntax:</strong> TimeOut <em>number</em><br>
! <strong>Default:</strong> <code>TimeOut 1200</code><br>
<strong>Context:</strong> server config<br>
<strong>Status:</strong> core<p>
--- 1146,1152 ----
<A name="timeout"><h2>TimeOut directive</h2></A>
<!--%plaintext <?INDEX {\tt TimeOut} directive> -->
<strong>Syntax:</strong> TimeOut <em>number</em><br>
! <strong>Default:</strong> <code>TimeOut 300</code><br>
<strong>Context:</strong> server config<br>
<strong>Status:</strong> core<p>
***************
*** 1162,1170 ****
</OL>
We plan on making these separately configurable at some point down the
! road. 1200 is very generous - you may consider turning it down to
! something smaller if you find the server getting swamped by
! half-completed connections from buggy browsers.
<p><hr>
--- 1162,1172 ----
</OL>
We plan on making these separately configurable at some point down the
! road. The timer used to default to 1200 before 1.2, but has been
! lowered to 300 which is still far more than necessary in most
! situations. It is not set any lower by default because there may
! still be odd places in the code where the timer is not reset when
! a packet is sent.
<p><hr>
1.162 +3 -0 /export/home/cvs/apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.161
retrieving revision 1.162
diff -C3 -r1.161 -r1.162
*** CHANGES 1997/02/16 07:44:15 1.161
--- CHANGES 1997/02/16 22:48:25 1.162
***************
*** 1,5 ****
--- 1,8 ----
Changes with Apache 1.2b7
+ *) Reduced the default timeout from 1200 seconds to 300, and the
+ one in the sample configfile from 400 to 300. [Marc Slemko]
+
*) Stop vbprintf from crashing if given a NULL string pointer;
print (null) instead. [Ken Coar]
1.86 +1 -1 /export/home/cvs/apache/src/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache/src/httpd.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -C3 -r1.85 -r1.86
*** httpd.h 1997/01/27 00:25:51 1.85
--- httpd.h 1997/02/16 22:48:26 1.86
***************
*** 181,187 ****
#define HUGE_STRING_LEN 8192
/* The timeout for waiting for messages */
! #define DEFAULT_TIMEOUT 1200
/* The timeout for waiting for keepalive timeout until next request */
#define DEFAULT_KEEPALIVE_TIMEOUT 15
--- 181,187 ----
#define HUGE_STRING_LEN 8192
/* The timeout for waiting for messages */
! #define DEFAULT_TIMEOUT 300
/* The timeout for waiting for keepalive timeout until next request */
#define DEFAULT_KEEPALIVE_TIMEOUT 15
