From: Eric Covener <covener@apache.org>
Date: Fri, 5 Nov 2010 16:29:08 +0000 (+0000)
Subject: PR#47782: compiled-in default for MaxConnectionsPerChild is 10,000 vs the
X-Git-Tag: 2.3.9~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c950bd71b087f6ae0aae1f5c4d712d1eac7560;p=thirdparty%2Fapache%2Fhttpd.git

PR#47782: compiled-in default for MaxConnectionsPerChild is 10,000 vs the
recommendations in the default conf and the manual.

Principle of least astonishment says to use a baked-in value of zero until
an admin asks for processes to exit this way.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031657 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 5abb977bdbd..ae012392d4c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@ Changes with Apache 2.3.9
      Fix a denial of service attack against mod_reqtimeout.
      [Stefan Fritsch]
 
+  *) prefork/worker/event MPMS: default value (when no directive is present)
+     of MaxConnectionsPerChild/MaxRequestsPerChild is changed to 0 from 10000 
+     to match default configuration and manual. PR47782 [Eric Covener]
+
   *) proxy_connect: Don't give up in the middle of a CONNECT tunnel
      when the child process is starting to exit.  PR50220. [Eric Covener]
 
diff --git a/server/mpm/event/mpm_default.h b/server/mpm/event/mpm_default.h
index 74ccd7a2cae..c0615b4689f 100644
--- a/server/mpm/event/mpm_default.h
+++ b/server/mpm/event/mpm_default.h
@@ -67,7 +67,7 @@
  * the children don't die off.
  */
 #ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
-#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 0
 #endif
 
 #endif /* AP_MPM_DEFAULT_H */
diff --git a/server/mpm/mpmt_os2/mpm_default.h b/server/mpm/mpmt_os2/mpm_default.h
index 2a21cd50888..e69c437db3f 100644
--- a/server/mpm/mpmt_os2/mpm_default.h
+++ b/server/mpm/mpmt_os2/mpm_default.h
@@ -61,7 +61,7 @@
  * the children don't die off.
  */
 #ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
-#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 0
 #endif
 
 #endif /* AP_MPM_DEFAULT_H */
diff --git a/server/mpm/prefork/mpm_default.h b/server/mpm/prefork/mpm_default.h
index 36e72a7a94f..3fe9182ce48 100644
--- a/server/mpm/prefork/mpm_default.h
+++ b/server/mpm/prefork/mpm_default.h
@@ -62,7 +62,7 @@
  * the children don't die off.
  */
 #ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
-#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 0
 #endif
 
 #endif /* AP_MPM_DEFAULT_H */
diff --git a/server/mpm/worker/mpm_default.h b/server/mpm/worker/mpm_default.h
index 422d59a158d..1743721bee5 100644
--- a/server/mpm/worker/mpm_default.h
+++ b/server/mpm/worker/mpm_default.h
@@ -66,7 +66,7 @@
  * the children don't die off.
  */
 #ifndef DEFAULT_MAX_REQUESTS_PER_CHILD
-#define DEFAULT_MAX_REQUESTS_PER_CHILD 10000
+#define DEFAULT_MAX_REQUESTS_PER_CHILD 0
 #endif
 
 #endif /* AP_MPM_DEFAULT_H */