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 5abb977bdbdcb73eccbc85f20de38a9025b16923..ae012392d4c1b04da56798b559ed04a9d09d53b0 100644 (file)
--- 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 74ccd7a2cae637d842e0f3522e6f11ba9adb789e..c0615b4689f84b65862dc3c1a8de43402b5d6640 100644 (file)
--- 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 2a21cd50888e1048cdf0f42d43d05c3a28615f5f..e69c437db3f29cde494f3b1d746d91dfc6344534 100644 (file)
--- 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 36e72a7a94fa203cccf1915c5a6a6e33e872b085..3fe9182ce4852997ed46c6deaa0b2c899a131bf2 100644 (file)
--- 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 422d59a158d59ceb23252448599c657b1fa555cd..1743721bee55dec99851f12e77e34277b032deba 100644 (file)
--- 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 */