Author: arekm Date: Tue Aug 18 06:19:39 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- better matching and rounding. will switch to minutes if
https://fedorahosted.org/tmpwatch/ticket/7 is implemented
---- Files affected:
packages/php-dirs:
php-session.sh (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/php-dirs/php-session.sh
diff -u packages/php-dirs/php-session.sh:1.1
packages/php-dirs/php-session.sh:1.2
--- packages/php-dirs/php-session.sh:1.1 Tue Aug 18 00:03:52 2009
+++ packages/php-dirs/php-session.sh Tue Aug 18 08:19:34 2009
@@ -1,14 +1,14 @@
#!/bin/sh
if [ -x /usr/bin/php.cli ] ; then
- RUNTIME5=$(/usr/bin/php.cli -r 'echo
1+(int)(ini_get("session.gc_maxlifetime")/3600);' 2> /dev/null)
+ RUNTIME5=$(/usr/bin/php.cli -r '$t =
round(ini_get("session.gc_maxlifetime")/3600); if ($t<1) $t=1; echo $t;' 2>
/dev/null)
elif [ -r /etc/php/php.ini ]; then
- RUNTIME5=$(awk -F"=" '/^session.gc_maxlifetime[[:space:]]*=/ {
t=sprintf("%d", 1+($2/3600)); print t;}' /etc/php/php.ini)
+ RUNTIME5=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ {
t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t;}' /etc/php/php.ini)
fi
if [ -x /usr/bin/php4.cli ] ; then
- RUNTIME4=$(/usr/bin/php4.cli -r 'echo
1+(int)(ini_get("session.gc_maxlifetime")/3600);' 2> /dev/null)
+ RUNTIME4=$(/usr/bin/php4.cli -r '$t =
round(ini_get("session.gc_maxlifetime")/3600); if ($t<1) $t=1; echo $t;' 2>
/dev/null)
elif [ -r /etc/php4/php.ini ]; then
- RUNTIME4=$(awk -F"=" '/^session.gc_maxlifetime[[:space:]]*=/ {
t=sprintf("%d", 1+($2/3600)); print t;}' /etc/php4/php.ini)
+ RUNTIME4=$(awk -F"=" '/^session.gc_maxlifetime[ \t]*=/ {
t=sprintf("%d", ($2/3600)); if (t<1) { t=1; }; print t;}' /etc/php4/php.ini)
fi
[ -z "$RUNTIME5" ] && RUNTIME5="1h"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-dirs/php-session.sh?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
