[Pkg-apache-commits] r1285 - in /trunk/apache2: README.Debian apache2ctl changelog config-dir/envvars

[sf at alioth.debian.org]

Author: sf
Date: Sun Feb 27 23:03:39 2011
New Revision: 1285

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1285
Log:
Set the default file descriptor limit to 8192 instead of whatever the
current limit is (usually 1024). Document how to change it.

Modified:
    trunk/apache2/README.Debian
    trunk/apache2/apache2ctl
    trunk/apache2/changelog
    trunk/apache2/config-dir/envvars

Modified: trunk/apache2/README.Debian
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/README.Debian?rev=1285&op=diff
==============================================================================
--- trunk/apache2/README.Debian (original)
+++ trunk/apache2/README.Debian Sun Feb 27 23:03:39 2011
@@ -48,7 +48,8 @@
 	This contains environment variables that may be used in the
 	configuration. Some settings, like user and pid file, need to
 	go in here so that other scripts can use them. It can also
-	be used to change some default settings used by apache2ctl.
+	be used to change some default settings used by apache2ctl,
+	including the ulimit value for the max number of open files.
 	Here is also the default LANG=C setting that can be changed
 	to a different language.
 

Modified: trunk/apache2/apache2ctl
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2ctl?rev=1285&op=diff
==============================================================================
--- trunk/apache2/apache2ctl (original)
+++ trunk/apache2/apache2ctl Sun Feb 27 23:03:39 2011
@@ -78,7 +78,7 @@
 # number of file descriptors allowed per child process. This is
 # critical for configurations that use many file descriptors,
 # such as mass vhosting, or a multithreaded server.
-ULIMIT_MAX_FILES="${APACHE_ULIMIT_MAX_FILES:-ulimit -S -n `ulimit -H -n`}"
+ULIMIT_MAX_FILES="${APACHE_ULIMIT_MAX_FILES:-ulimit -n 8192}"
 # --------------------                              --------------------
 # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
 

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1285&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Feb 27 23:03:39 2011
@@ -2,6 +2,9 @@
 
   * Make exit code of '/etc/init.d/apache2 status' more LSB compatible.
     Closes: #613969
+  * Set the default file descriptor limit to 8192 instead of whatever the
+    current limit is (usually 1024). Document how to change it in
+    /etc/apache2/envvars . Closes: #615632
   * Add hint in README.Debian about 403 error with mod_dav PUT. Closes: #613438
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 26 Feb 2011 15:04:45 +0100

Modified: trunk/apache2/config-dir/envvars
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/envvars?rev=1285&op=diff
==============================================================================
--- trunk/apache2/config-dir/envvars (original)
+++ trunk/apache2/config-dir/envvars Sun Feb 27 23:03:39 2011
@@ -31,3 +31,7 @@
 ## The command to get the status for 'apache2ctl status'.
 ## Some packages providing 'www-browser' need '--dump' instead of '-dump'.
 #export APACHE_LYNX='www-browser -dump'
+
+## If you need a higher file descriptor limit, uncomment and adjust the
+## following line (default is 8192):
+#APACHE_ULIMIT_MAX_FILES='ulimit -n 65536'