The branch, master has been updated via bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d (commit) via 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a (commit) from 573edc0329f779dac9ad68dcd8f20ef304f885e5 (commit)
- Log ----------------------------------------------------------------- commit bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d Merge: 573edc0329f779dac9ad68dcd8f20ef304f885e5 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a Author: Marc Delisle marc@infomarc.info Date: Tue Jul 6 16:58:50 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/config.default.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 35c86f5..61d2c52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ $Id$ - bug [replication] Do not offer information_schema in the list of databases - bug [js] Avoid loading twice a js file - bug #3024344 [setup] Setup forces numeric MemoryLimit +- bug #3025975 [auth] Odd LoginCookieValidity default value
3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/config.default.php b/libraries/config.default.php index be034c8..7b24d87 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -587,11 +587,11 @@ $cfg['Confirm'] = true; $cfg['LoginCookieRecall'] = true;
/** - * validity of cookie login (in seconds) + * validity of cookie login (in seconds; 1800 seconds is 30 minutes) * * @global integer $cfg['LoginCookieValidity'] */ -$cfg['LoginCookieValidity'] = 1440; +$cfg['LoginCookieValidity'] = 1800;
/** * how long login cookie should be stored (in seconds)
hooks/post-receive
-
Marc Delisle