diff options
author | Aleksander Machniak <alec@alec.pl> | 2012-11-15 09:34:08 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2012-11-15 09:34:08 +0100 |
commit | 8d54286df87e21673c05f091e38ca4de14aae326 (patch) | |
tree | d60c6d6765f5beafe4966352ebbd52e4c9c9661b /config | |
parent | 82d875769cade12b82aeab6723c869d87fb7a4c9 (diff) | |
parent | f226549d4f8f258deca9e165ef857252b79d2ee0 (diff) |
Merge branch 'keep-alive'
Conflicts:
CHANGELOG
Diffstat (limited to 'config')
-rw-r--r-- | config/main.inc.php.dist | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index dc76f1887..3c7d8eda6 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -241,7 +241,6 @@ $rcmail_config['skin_include_php'] = false; $rcmail_config['display_version'] = false; // Session lifetime in minutes -// must be greater than 'keep_alive'/60 $rcmail_config['session_lifetime'] = 10; // Session domain: .example.org @@ -504,9 +503,8 @@ $rcmail_config['recipients_separator'] = ','; // don't let users set pagesize to more than this value if set $rcmail_config['max_pagesize'] = 200; -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; +// Minimal value of user's 'refresh_interval' setting (in seconds) +$rcmail_config['min_refresh_interval'] = 60; // Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. // By default refresh time is set to 1 second. You can set this value to true @@ -790,9 +788,10 @@ $rcmail_config['read_when_deleted'] = true; // Use 'Purge' to remove messages marked as deleted $rcmail_config['flag_for_deletion'] = false; -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; +// Default interval for auto-refresh requests (in seconds) +// These are requests for system state updates e.g. checking for new messages, etc. +// Setting it to 0 disables the feature. +$rcmail_config['refresh_interval'] = 60; // If true all folders will be checked for recent messages $rcmail_config['check_all_folders'] = false; |