Merge pull request #326 from jchristi/httpd-max-requests-per-child

phracek · web-flow · commit 53986e886b1b · 2021-03-16T10:24:27.000+01:00
Allow configuration of Apache HTTP MaxRequestsPerChild and MaxKeepAliveRequests
diff --git a/7.2/README.md b/7.2/README.md
@@ -15,10 +15,10 @@ Description
 
 PHP 7.2 available as container is a base platform for
 building and running various PHP 7.2 applications and frameworks.
-PHP is an HTML-embedded scripting language. PHP attempts to make it easy for developers 
-to write dynamically generated web pages. PHP also offers built-in database integration 
-for several commercial and non-commercial database management systems, so writing 
-a database-enabled webpage with PHP is fairly simple. The most common use of PHP coding 
+PHP is an HTML-embedded scripting language. PHP attempts to make it easy for developers
+to write dynamically generated web pages. PHP also offers built-in database integration
+for several commercial and non-commercial database management systems, so writing
+a database-enabled webpage with PHP is fairly simple. The most common use of PHP coding
 is probably as a replacement for CGI scripts.
 
 This container image includes an npm utility, so users can use it to install JavaScript
@@ -191,7 +191,7 @@ The following environment variables set their equivalent property value in the p
   * Default: /tmp/sessions
 * **SESSION_COOKIE_DOMAIN**
   * The domain for which the cookie is valid.
-  * Default: 
+  * Default:
 * **SESSION_COOKIE_HTTPONLY**
   * Whether or not to add the httpOnly flag to the cookie
   * Default: 0
@@ -214,7 +214,7 @@ The following environment variables set their equivalent property value in the o
   * Default: 2
 * **OPCACHE_MAX_FILES**
   * The maximum number of keys (scripts) in the OPcache hash table. Only numbers between 200 and 1000000 are allowed.
-  * Default: 4000  
+  * Default: 4000
 
 You can also override the entire directory used to load the PHP configuration by setting:
 * **PHPRC**
@@ -238,6 +238,17 @@ yourself:
   * `MaxRequestWorkers` was called `MaxClients` before version httpd 2.3.13.
   * Default: 256 (this is automatically tuned by setting Cgroup limits for the container using this formula:
     `TOTAL_MEMORY / 15MB`. The 15MB is average size of a single httpd process.
+* **HTTPD_MAX_REQUESTS_PER_CHILD**
+  * The [MaxRequestsPerChild](http://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild)
+    directive sets the limit on the number of connections that an individual child server process will handle.
+    After `MaxRequestsPerChild` connections, the child process will die. If `MaxRequestsPerChild` is 0, then the process will never expire.
+  * Setting `MaxRequestsPerChild` to a non-zero value limits the amount of memory that a process can consume by (accidental) memory leakage.
+  * `MaxRequestsPerChild` is called `MaxConnectionsPerChild` in Apache HTTP 2.3.9 and later.
+  * Default: 4000
+* **HTTPD_MAX_KEEPALIVE_REQUESTS**
+  * The [MaxKeepAliveRequests](http://httpd.apache.org/docs/current/mod/core.html#maxkeepaliverequests)
+    directive limits the number of requests allowed per connection when `KeepAlive` is on. If it is set to 0, unlimited requests will be allowed.
+  * Default: 100
 
   You can use a custom composer repository mirror URL to download packages instead of the default 'packagist.org':
 
diff --git a/7.2/root/usr/share/container-scripts/php/httpd-cnf/50-mpm-tuning.conf b/7.2/root/usr/share/container-scripts/php/httpd-cnf/50-mpm-tuning.conf
@@ -3,10 +3,10 @@
     StartServers          ${HTTPD_START_SERVERS}
     MinSpareServers       ${HTTPD_START_SERVERS}
     MaxSpareServers       ${HTTPD_MAX_SPARE_SERVERS}
-    # The MaxRequestWorkers directive sets the limit on the number of simultaneous requests that will be served. 
+    # The MaxRequestWorkers directive sets the limit on the number of simultaneous requests that will be served.
     # The default value, when no Cgroup limits are set is 256.
     MaxRequestWorkers     ${HTTPD_MAX_REQUEST_WORKERS}
     ServerLimit           ${HTTPD_MAX_REQUEST_WORKERS}
-    MaxRequestsPerChild   4000
-    MaxKeepAliveRequests  100
+    MaxRequestsPerChild   ${HTTPD_MAX_REQUESTS_PER_CHILD}
+    MaxKeepAliveRequests  ${HTTPD_MAX_KEEPALIVE_REQUESTS}
 </IfModule>
diff --git a/7.2/s2i/bin/run b/7.2/s2i/bin/run
@@ -36,6 +36,8 @@ envsubst < /opt/app-root/etc/php.d/10-opcache.ini.template > ${PHP_SYSCONF_PATH}
 
 export HTTPD_START_SERVERS=${HTTPD_START_SERVERS:-8}
 export HTTPD_MAX_SPARE_SERVERS=$((HTTPD_START_SERVERS+10))
+export HTTPD_MAX_REQUESTS_PER_CHILD=${HTTPD_MAX_REQUESTS_PER_CHILD:-4000}
+export HTTPD_MAX_KEEPALIVE_REQUESTS=${HTTPD_MAX_KEEPALIVE_REQUESTS:-100}
 
 if [ -n "${NO_MEMORY_LIMIT:-}" -o -z "${MEMORY_LIMIT_IN_BYTES:-}" ]; then
   #
diff --git a/7.3/README.md b/7.3/README.md
@@ -15,10 +15,10 @@ Description
 
 PHP 7.3 available as container is a base platform for
 building and running various PHP 7.3 applications and frameworks.
-PHP is an HTML-embedded scripting language. PHP attempts to make it easy for developers 
-to write dynamically generated web pages. PHP also offers built-in database integration 
-for several commercial and non-commercial database management systems, so writing 
-a database-enabled webpage with PHP is fairly simple. The most common use of PHP coding 
+PHP is an HTML-embedded scripting language. PHP attempts to make it easy for developers
+to write dynamically generated web pages. PHP also offers built-in database integration
+for several commercial and non-commercial database management systems, so writing
+a database-enabled webpage with PHP is fairly simple. The most common use of PHP coding
 is probably as a replacement for CGI scripts.
 
 This container image includes an npm utility, so users can use it to install JavaScript
@@ -191,7 +191,7 @@ The following environment variables set their equivalent property value in the p
   * Default: /tmp/sessions
 * **SESSION_COOKIE_DOMAIN**
   * The domain for which the cookie is valid.
-  * Default: 
+  * Default:
 * **SESSION_COOKIE_HTTPONLY**
   * Whether or not to add the httpOnly flag to the cookie
   * Default: 0
@@ -214,7 +214,7 @@ The following environment variables set their equivalent property value in the o
   * Default: 2
 * **OPCACHE_MAX_FILES**
   * The maximum number of keys (scripts) in the OPcache hash table. Only numbers between 200 and 1000000 are allowed.
-  * Default: 4000  
+  * Default: 4000
 
 You can also override the entire directory used to load the PHP configuration by setting:
 * **PHPRC**
@@ -238,6 +238,17 @@ yourself:
   * `MaxRequestWorkers` was called `MaxClients` before version httpd 2.3.13.
   * Default: 256 (this is automatically tuned by setting Cgroup limits for the container using this formula:
     `TOTAL_MEMORY / 15MB`. The 15MB is average size of a single httpd process.
+* **HTTPD_MAX_REQUESTS_PER_CHILD**
+  * The [MaxRequestsPerChild](http://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild)
+    directive sets the limit on the number of connections that an individual child server process will handle.
+    After `MaxRequestsPerChild` connections, the child process will die. If `MaxRequestsPerChild` is 0, then the process will never expire.
+  * Setting `MaxRequestsPerChild` to a non-zero value limits the amount of memory that a process can consume by (accidental) memory leakage.
+  * `MaxRequestsPerChild` is called `MaxConnectionsPerChild` in Apache HTTP 2.3.9 and later.
+  * Default: 4000
+* **HTTPD_MAX_KEEPALIVE_REQUESTS**
+  * The [MaxKeepAliveRequests](http://httpd.apache.org/docs/current/mod/core.html#maxkeepaliverequests)
+    directive limits the number of requests allowed per connection when `KeepAlive` is on. If it is set to 0, unlimited requests will be allowed.
+  * Default: 100
 
   You can use a custom composer repository mirror URL to download packages instead of the default 'packagist.org':
 
diff --git a/7.3/root/usr/share/container-scripts/php/httpd-cnf/50-mpm-tuning.conf b/7.3/root/usr/share/container-scripts/php/httpd-cnf/50-mpm-tuning.conf
@@ -3,10 +3,10 @@
     StartServers          ${HTTPD_START_SERVERS}
     MinSpareServers       ${HTTPD_START_SERVERS}
     MaxSpareServers       ${HTTPD_MAX_SPARE_SERVERS}
-    # The MaxRequestWorkers directive sets the limit on the number of simultaneous requests that will be served. 
+    # The MaxRequestWorkers directive sets the limit on the number of simultaneous requests that will be served.
     # The default value, when no Cgroup limits are set is 256.
     MaxRequestWorkers     ${HTTPD_MAX_REQUEST_WORKERS}
     ServerLimit           ${HTTPD_MAX_REQUEST_WORKERS}
-    MaxRequestsPerChild   4000
-    MaxKeepAliveRequests  100
+    MaxRequestsPerChild   ${HTTPD_MAX_REQUESTS_PER_CHILD}
+    MaxKeepAliveRequests  ${HTTPD_MAX_KEEPALIVE_REQUESTS}
 </IfModule>
diff --git a/7.3/s2i/bin/run b/7.3/s2i/bin/run
@@ -36,6 +36,8 @@ envsubst < /opt/app-root/etc/php.d/10-opcache.ini.template > ${PHP_SYSCONF_PATH}
 
 export HTTPD_START_SERVERS=${HTTPD_START_SERVERS:-8}
 export HTTPD_MAX_SPARE_SERVERS=$((HTTPD_START_SERVERS+10))
+export HTTPD_MAX_REQUESTS_PER_CHILD=${HTTPD_MAX_REQUESTS_PER_CHILD:-4000}
+export HTTPD_MAX_KEEPALIVE_REQUESTS=${HTTPD_MAX_KEEPALIVE_REQUESTS:-100}
 
 if [ -n "${NO_MEMORY_LIMIT:-}" -o -z "${MEMORY_LIMIT_IN_BYTES:-}" ]; then
   #
diff --git a/7.4/README.md b/7.4/README.md
@@ -15,10 +15,10 @@ Description
 
 PHP 7.4 available as container is a base platform for
 building and running various PHP 7.4 applications and frameworks.
-PHP is an HTML-embedded scripting language. PHP attempts to make it easy for developers 
-to write dynamically generated web pages. PHP also offers built-in database integration 
-for several commercial and non-commercial database management systems, so writing 
-a database-enabled webpage with PHP is fairly simple. The most common use of PHP coding 
+PHP is an HTML-embedded scripting language. PHP attempts to make it easy for developers
+to write dynamically generated web pages. PHP also offers built-in database integration
+for several commercial and non-commercial database management systems, so writing
+a database-enabled webpage with PHP is fairly simple. The most common use of PHP coding
 is probably as a replacement for CGI scripts.
 
 This container image includes an npm utility, so users can use it to install JavaScript
@@ -191,7 +191,7 @@ The following environment variables set their equivalent property value in the p
   * Default: /tmp/sessions
 * **SESSION_COOKIE_DOMAIN**
   * The domain for which the cookie is valid.
-  * Default: 
+  * Default:
 * **SESSION_COOKIE_HTTPONLY**
   * Whether or not to add the httpOnly flag to the cookie
   * Default: 0
@@ -214,7 +214,7 @@ The following environment variables set their equivalent property value in the o
   * Default: 2
 * **OPCACHE_MAX_FILES**
   * The maximum number of keys (scripts) in the OPcache hash table. Only numbers between 200 and 1000000 are allowed.
-  * Default: 4000  
+  * Default: 4000
 
 You can also override the entire directory used to load the PHP configuration by setting:
 * **PHPRC**
@@ -238,6 +238,17 @@ yourself:
   * `MaxRequestWorkers` was called `MaxClients` before version httpd 2.3.13.
   * Default: 256 (this is automatically tuned by setting Cgroup limits for the container using this formula:
     `TOTAL_MEMORY / 15MB`. The 15MB is average size of a single httpd process.
+* **HTTPD_MAX_REQUESTS_PER_CHILD**
+  * The [MaxRequestsPerChild](http://httpd.apache.org/docs/current/mod/mpm_common.html#maxconnectionsperchild)
+    directive sets the limit on the number of connections that an individual child server process will handle.
+    After `MaxRequestsPerChild` connections, the child process will die. If `MaxRequestsPerChild` is 0, then the process will never expire.
+  * Setting `MaxRequestsPerChild` to a non-zero value limits the amount of memory that a process can consume by (accidental) memory leakage.
+  * `MaxRequestsPerChild` is called `MaxConnectionsPerChild` in Apache HTTP 2.3.9 and later.
+  * Default: 4000
+* **HTTPD_MAX_KEEPALIVE_REQUESTS**
+  * The [MaxKeepAliveRequests](http://httpd.apache.org/docs/current/mod/core.html#maxkeepaliverequests)
+    directive limits the number of requests allowed per connection when `KeepAlive` is on. If it is set to 0, unlimited requests will be allowed.
+  * Default: 100
 
   You can use a custom composer repository mirror URL to download packages instead of the default 'packagist.org':
 
diff --git a/7.4/root/usr/share/container-scripts/php/httpd-cnf/50-mpm-tuning.conf b/7.4/root/usr/share/container-scripts/php/httpd-cnf/50-mpm-tuning.conf
@@ -3,10 +3,10 @@
     StartServers          ${HTTPD_START_SERVERS}
     MinSpareServers       ${HTTPD_START_SERVERS}
     MaxSpareServers       ${HTTPD_MAX_SPARE_SERVERS}
-    # The MaxRequestWorkers directive sets the limit on the number of simultaneous requests that will be served. 
+    # The MaxRequestWorkers directive sets the limit on the number of simultaneous requests that will be served.
     # The default value, when no Cgroup limits are set is 256.
     MaxRequestWorkers     ${HTTPD_MAX_REQUEST_WORKERS}
     ServerLimit           ${HTTPD_MAX_REQUEST_WORKERS}
-    MaxRequestsPerChild   4000
-    MaxKeepAliveRequests  100
+    MaxRequestsPerChild   ${HTTPD_MAX_REQUESTS_PER_CHILD}
+    MaxKeepAliveRequests  ${HTTPD_MAX_KEEPALIVE_REQUESTS}
 </IfModule>
diff --git a/7.4/s2i/bin/run b/7.4/s2i/bin/run
@@ -36,6 +36,8 @@ envsubst < /opt/app-root/etc/php.d/10-opcache.ini.template > ${PHP_SYSCONF_PATH}
 
 export HTTPD_START_SERVERS=${HTTPD_START_SERVERS:-8}
 export HTTPD_MAX_SPARE_SERVERS=$((HTTPD_START_SERVERS+10))
+export HTTPD_MAX_REQUESTS_PER_CHILD=${HTTPD_MAX_REQUESTS_PER_CHILD:-4000}
+export HTTPD_MAX_KEEPALIVE_REQUESTS=${HTTPD_MAX_KEEPALIVE_REQUESTS:-100}
 
 if [ -n "${NO_MEMORY_LIMIT:-}" -o -z "${MEMORY_LIMIT_IN_BYTES:-}" ]; then
   #

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ envsubst < /opt/app-root/etc/php.d/10-opcache.ini.template > ${PHP_SYSCONF_PATH}`
`36`	`36`
`37`	`37`	`export HTTPD_START_SERVERS=${HTTPD_START_SERVERS:-8}`
`38`	`38`	`export HTTPD_MAX_SPARE_SERVERS=$((HTTPD_START_SERVERS+10))`
	`39`	`+export HTTPD_MAX_REQUESTS_PER_CHILD=${HTTPD_MAX_REQUESTS_PER_CHILD:-4000}`
	`40`	`+export HTTPD_MAX_KEEPALIVE_REQUESTS=${HTTPD_MAX_KEEPALIVE_REQUESTS:-100}`
`39`	`41`
`40`	`42`	`if [ -n "${NO_MEMORY_LIMIT:-}" -o -z "${MEMORY_LIMIT_IN_BYTES:-}" ]; then`
`41`	`43`	`#`