[Pkg-apache-commits] r964 - in /branches/etch-apache2: README.Debian changelog patches/00list patches/070_check_pollset_create_error.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Thu Jun 11 08:30:07 2009
New Revision: 964

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=964
Log:
revert epoll fix not necessary for etch, kernel change has been reverted

Removed:
    branches/etch-apache2/patches/070_check_pollset_create_error.dpatch
Modified:
    branches/etch-apache2/README.Debian
    branches/etch-apache2/changelog
    branches/etch-apache2/patches/00list

Modified: branches/etch-apache2/README.Debian
URL: http://svn.debian.org/wsvn/pkg-apache/branches/etch-apache2/README.Debian?rev=964&op=diff
==============================================================================
--- branches/etch-apache2/README.Debian (original)
+++ branches/etch-apache2/README.Debian Thu Jun 11 08:30:07 2009
@@ -10,8 +10,6 @@
 	Using SSL keys with passwords /	Restarting Apache during logrotate
 
 	SSL workaround for MSIE
-
-	Epoll limits on linux kernels >= 2.6.27.8
 
 	Documentation
 
@@ -133,37 +131,6 @@
                                 downgrade-1.0 force-response-1.0
 
 
-Epoll limits on linux kernels >= 2.6.27.8
-=========================================
-
-If you see the message
-
-	Couldn't create pollset in child; check user or system limits
-
-in the error log you have hit the new epoll limit. On Linux kernels starting
-with 2.6.27.8, the value in
-
-    /proc/sys/fs/epoll/max_user_instances
-
-needs to be larger than
-
-    for prefork/itk  MPM: 2 * MaxClients
-    for worker/event MPM: MaxClients + MaxClients/ThreadsPerChild
-
-It can be set on boot by adding a line like
-
-        fs.epoll.max_user_instances=1024
-
-to /etc/sysctl.conf.
-
-There are several other error messages related to creating a pollset that can
-appear for the same reason.
-
-On the other hand, errors about to adding to a pollset are related to the
-setting fs.epoll.max_user_watches. On most systems, max_user_watches should be
-high enough by default.
-
-
 Documentation
 =============
 

Modified: branches/etch-apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/branches/etch-apache2/changelog?rev=964&op=diff
==============================================================================
--- branches/etch-apache2/changelog (original)
+++ branches/etch-apache2/changelog Thu Jun 11 08:30:07 2009
@@ -1,11 +1,3 @@
-apache2 (2.2.3-4+etch7) UNRELEASED; urgency=low
-
-  * Report an error instead of segfaulting when apr_pollset_create fails.
-    See README.Debian if you are running on a self-compiled Linux kernel
-    2.6.27.8 or newer. Closes: #511103
-
- -- Stefan Fritsch <sf at debian.org>  Wed, 28 Jan 2009 21:38:17 +0100
-
 apache2 (2.2.3-4+etch6) stable; urgency=low
 
   * Fix CVE-2007-6388: XSS in mod_status

Modified: branches/etch-apache2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/branches/etch-apache2/patches/00list?rev=964&op=diff
==============================================================================
--- branches/etch-apache2/patches/00list (original)
+++ branches/etch-apache2/patches/00list Thu Jun 11 08:30:07 2009
@@ -33,4 +33,3 @@
 067-bad_file_descriptor_PR42829.dpatch
 068_htpasswd_salt.dpatch
 069_mod_cache_IfRange.dpatch
-070_check_pollset_create_error.dpatch