move gc lookup to function, add php56

diff --git a/php-session.sh b/php-session.sh
index 81f90bcf90130f256638c0898f5c72d1ae15a0b8..1d2befca752ed66e65411481440ba181655c2ec3 100755 (executable)
--- a/php-session.sh
+++ b/php-session.sh
@@ -18,21 +18,25 @@ cleanup_dir() {
 }
 
 # find minimum gc time from any of the php engines
-gc_time=0
-for php in php php4 php52 php53 php54 php55; do
-       gc=
-       if [ -x /usr/bin/$php ]; then
-               gc=$($php -r 'echo max(round(ini_get("session.gc_maxlifetime")/3600), 1);' 2> /dev/null)
-       elif [ -r /etc/$php/php.ini ]; then
-               gc=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ { t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t; exit;}' /etc/$php/php.ini)
-       fi
-       [ -n "$gc" ] || continue
-
-       if [ "$gc" -lt "$gc_time" ] || [ $gc_time -eq 0 ]; then
-               gc_time=$gc
-       fi
-done
+find_gc_time() {
+       gc_time=0
+       local gc php
+       for php in php php4 php52 php53 php54 php55 php56; do
+               gc=
+               if [ -x /usr/bin/$php ]; then
+                       gc=$($php -r 'echo max(round(ini_get("session.gc_maxlifetime")/3600), 1);' 2> /dev/null)
+               elif [ -r /etc/$php/php.ini ]; then
+                       gc=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ { t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t; exit;}' /etc/$php/php.ini)
+               fi
+               [ -n "$gc" ] || continue
+
+               if [ "$gc" -lt "$gc_time" ] || [ $gc_time -eq 0 ]; then
+                       gc_time=$gc
+               fi
+       done
+}
 
+find_gc_time
 [ $gc_time -gt 0 ] || exit 0
 
 for session_dir in $session_dirs; do