From fd85539dcbc8a260eb6ad5fd509a3ede586711bb Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 3 Dec 2015 10:13:38 +0100 Subject: [PATCH] Adding 'PHP_INI_SCAN_DIR=/etc/php/${version}/${conf_dir}/conf.d/' to session cleanup script when calling php This allows us to respect 'session.gc_maxlifetime' from conf.d directory --- sessionclean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sessionclean b/sessionclean index c235f6c..db6efb9 100755 --- a/sessionclean +++ b/sessionclean @@ -31,7 +31,7 @@ for version in $(/usr/sbin/phpquery -V); do while IFS=: read -r conf_dir proc_name; do if [ -e /etc/php/${version}/${conf_dir}/php.ini ]; then # Get all session variables once so we don't need to start PHP to get each config option - session_config=$(php${version} -c /etc/php/${version}/${conf_dir}/php.ini -d "error_reporting='~E_ALL'" -r 'foreach(ini_get_all("session") as $k => $v) echo "$k=".$v["local_value"]."\n";') + session_config=$(PHP_INI_SCAN_DIR=/etc/php/${version}/${conf_dir}/conf.d/ php${version} -c /etc/php/${version}/${conf_dir}/php.ini -d "error_reporting='~E_ALL'" -r 'foreach(ini_get_all("session") as $k => $v) echo "$k=".$v["local_value"]."\n";') save_handler=$(echo "$session_config" | sed -ne 's/^session\.save_handler=\(.*\)$/\1/p') save_path=$(echo "$session_config" | sed -ne 's/^session\.save_path=\(.*;\)\?\(.*\)$/\2/p') gc_maxlifetime=$(($(echo "$session_config" | sed -ne 's/^session\.gc_maxlifetime=\(.*\)$/\1/p')/60))