Release 7.5.5 - See CHANGELOG.md

tiredofit · Mar 23, 2023 · aac18fd · aac18fd
1 parent f810c2d
commit aac18fd
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.5.5 2023-03-23 <dave at tiredofit dot ca>
+
+ ### Added
+  - Add more OPCache options and fix broken options
+
+
 ## 7.5.4 2023-03-23 <dave at tiredofit dot ca>
 
  ### Added

diff --git a/README.md b/README.md
@@ -211,12 +211,17 @@ When `PHP_FPM_CONTAINER_MODE` set to `nginx` the `PHP_FPM_LISTEN_PORT` environme
 | `PHP_LOG_LIMIT` | Characters to log | `2048` |
 | `PHP_LOG_LOCATION` | Log Location for PHP Logs | `/www/logs/php-fpm` |
 | `PHP_MEMORY_LIMIT` | How much memory should PHP use | `128M` |
-| `PHP_OPCACHE_INTERNED_STRINGS_BUFFER` | OPCache interned strings buffer | `16` |
+| `PHP_OPCACHE_INTERNED_STRINGS_BUFFER` | OPCache interned strings buffer | `8`  |
 | `PHP_OPCACHE_JIT_BUFFER_SIZE` | JIT Buffer Size `0` to disable | `50M` |
 | `PHP_OPCACHE_JIT_MODE` | JIT [CRTO](https://wiki.php.net/rfc/jit) Mode - > PHP 8.x | `1255` |
-| `PHP_OPCACHE_MAX_ACCELERATED_FILES` | OPCache Max accelerated files | `5413`  |
+| `PHP_OPCACHE_MAX_ACCELERATED_FILES` | OPCache Max accelerated files | `10000` |
 | `PHP_OPCACHE_MEM_SIZE` | OPCache Memory Size - Set `0` to disable or via other env vars | `128` |
-| `PHP_OPCACHE_REVALIDATE_FREQ` | OPCache revalidate frequency | `60` |
+| `PHP_OPCACHE_REVALIDATE_FREQ` | OPCache revalidate frequency in seconds | `2` |
+| `PHP_OPCACHE_MAX_WASTED_PERCENTAGE` | Max wasted percentage cache | `5` |
+| `PHP_OPCACHE_VALIDATE_TIMESTAMPS` | Validate timestamps `1` or `0` | `1` |
+| `PHP_OPCACHE_SAVE_COMMENTS` | Opcache Save Comments `0` or `1` | `1` |
+| `PHP_OPCACHE_MAX_FILE_SIZE` | Opcache maximum file size | `0` |
+| `PHP_OPCACHE_OPTIMIZATION_LEVEL` | Opcache optimization level | `0x7FFFBFF` |
 | `PHP_POST_MAX_SIZE` | Maximum Input Size for POST | `2G` |
 | `PHP_TIMEOUT` | Maximum Script execution Time | `180` |
 | `PHP_UPLOAD_MAX_SIZE` | Maximum Input Size for Uploads | `2G` |

diff --git a/install/assets/defaults/20-php-fpm b/install/assets/defaults/20-php-fpm
@@ -25,12 +25,17 @@ PHP_LOG_LEVEL=${PHP_LOG_LEVEL:-"notice"}
 PHP_LOG_LIMIT=${PHP_LOG_LIMIT:-"3072"}
 PHP_LOG_LOCATION=${PHP_LOG_LOCATION:-"/www/logs/php-fpm"}
 PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-"128M"}
-PHP_OPCACHE_INTERNED_STRINGS_BUFFER=${PHP_OPCACHE_INTERNED_STRINGS_BUFFER:-"16"}
+PHP_OPCACHE_INTERNED_STRINGS_BUFFER=${PHP_OPCACHE_INTERNED_STRINGS_BUFFER:-"8"}
 PHP_OPCACHE_JIT_BUFFER_SIZE=${PHP_OPCACHE_JIT_BUFFER_SIZE:-"50M"}
 PHP_OPCACHE_JIT_MODE=${PHP_OPCACHE_JIT_MODE:-"1255"}
-PHP_OPCACHE_MAX_ACCELERATED_FILES=${PHP_OPCACHE_MAX_ACCELERATED_FILES:-"5413"}
+PHP_OPCACHE_MAX_ACCELERATED_FILES=${PHP_OPCACHE_MAX_ACCELERATED_FILES:-"10000"}
+PHP_OPCACHE_MAX_FILE_SIZE=${PHP_OPCACHE_MAX_FILE_SIZE:-"0"}
+PHP_OPCACHE_MAX_WASTED_PERCENTAGE=${PHP_OPCACHE_MAX_WASTED_PERCENTAGE:-"5"}
 PHP_OPCACHE_MEM_SIZE=${PHP_OPCACHE_MEM_SIZE:-"128"}
-PHP_OPCACHE_REVALIDATE_FREQ=${PHP_OPCACHE_REVALIDATE_FREQ:-"60"}
+PHP_OPCACHE_OPTIMIZATION_LEVEL=${PHP_OPCACHE_OPTIMIZATION_LEVEL:-"0x7FFFBFF"}
+PHP_OPCACHE_REVALIDATE_FREQ=${PHP_OPCACHE_REVALIDATE_FREQ:-"2"}
+PHP_OPCACHE_SAVE_COMMENTS=${PHP_OPCACHE_SAVE_COMMENTS:-"1"}
+PHP_OPCACHE_VALIDATE_TIMESTAMPS=${PHP_OPCACHE_VALIDATE_TIMESTAMPS:-"1"}
 PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE:-"2G"}
 PHP_TIMEOUT=${PHP_TIMEOUT:-"180"}
 PHP_UPLOAD_MAX_SIZE=${PHP_UPLOAD_MAX_SIZE:-"2G"}

diff --git a/install/assets/functions/20-php-fpm b/install/assets/functions/20-php-fpm
@@ -217,10 +217,16 @@ phpfpm_configure_server() {
  /assets/php-fpm//mods-available/apcu.ini
 
  sed -i \
- -e "s#opcache.memory_consumption=.*#opcache.memory_consumption=${PHP_OPCACHE_MEM_SIZE}#g" \
  -e "s#opcache.interned_strings_buffer=.*#opcache.interned_strings_buffer=${PHP_OPCACHE_INTERNED_STRINGS_BUFFER}#g" \
- -e "s#opcache.max_accelerated_files=.*#max_accelerated_files=${PHP_OPCACHE_MAX_ACCELERATED_FILES}#g" \
- -e "s#opcache.revalidate_freq=.*#revalidate_freq=${PHP_OPCACHE_REVALIDATE_FREQ}#g" \
+ -e "s#opcache.max_accelerated_files=.*#opcache.max_accelerated_files=${PHP_OPCACHE_MAX_ACCELERATED_FILES}#g" \
+ -e "s#opcache.max_file_size=.*#opcache.max_file_size=${PHP_OPCACHE_MAX_FILE_SIZE}#g" \
+ -e "s#opcache.max_wasted_percentage=.*#opcache.max_wasted_percentage=${PHP_OPCACHE_MAX_WASTED_PERCENTAGE}#g" \
+ -e "s#opcache.memory_consumption=.*#opcache.memory_consumption=${PHP_OPCACHE_MEM_SIZE}#g" \
+ -e "s#opcache.optimization_level=.*#opcache.optimization_level=${PHP_OPCACHE_OPTIMIZATION_LEVEL}#g" \
+ -e "s#opcache.revalidate_freq=.*#opcache.revalidate_freq=${PHP_OPCACHE_REVALIDATE_FREQ}#g" \
+ -e "s#opcache.revalidate_freq=.*#opcache.revalidate_freq=${PHP_OPCACHE_REVALIDATE_FREQ}#g" \
+ -e "s#opcache.save_comments=.*#opcache.save_comments=${PHP_OPCACHE_SAVE_COMMENTS}#g" \
+ -e "s#opcache.validate_timestamps=.*#opcache.validate_timestamps=${PHP_OPCACHE_VALIDATE_TIMESTAMPS}#g" \
  /assets/php-fpm/mods-available/opcache.ini
 
  if [ "${PHP_BASE:0:1}" = "7" ] ; then

diff --git a/install/assets/php-fpm/mods-available/opcache.ini b/install/assets/php-fpm/mods-available/opcache.ini
@@ -1,9 +1,15 @@
 zend_extension=opcache.so
 opcache.enable=1
 opcache.enable_cli=1
-opcache.fast_shutdown=1
 opcache.memory_consumption=128
-opcache.interned_strings_buffer=16
-opcache.max_accelerated_files=5413
-opcache.revalidate_freq=60
+opcache.interned_strings_buffer=8
+opcache.max_accelerated_files=10000
+opcache.max_wasted_percentage=5
+opcache.validate_timestamps=1
+opcache.revalidate_freq=2
+opcache.save_comments=1
+opcache.optimization_level=0x7FFFBFFF
+opcache.max_file_size=0
+opcache.jit_buffer_size=0
+opcache.jit=1255
 ;priority=10