summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-06 18:03:10 +0000
committeralecpl <alec@alec.pl>2008-10-06 18:03:10 +0000
commitaaa6ace377f57ca22de56eff96230cfcc74c62a8 (patch)
tree9e52ed2caf3454c09c988bdb969304d57d7dddc9
parent28db73f7c9aa844d247332b50b19b0074fe74598 (diff)
#1485460: session.gc_* moved to main .htaccess file
-rw-r--r--.htaccess28
-rwxr-xr-xprogram/include/iniset.php2
2 files changed, 16 insertions, 14 deletions
diff --git a/.htaccess b/.htaccess
index 9e3667b09..bd11ae6ec 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,18 +1,22 @@
# AddDefaultCharset UTF-8
AddType text/x-component .htc
-<IfModule mod_php5.c>
- php_flag display_errors Off
- php_flag log_errors On
- php_value error_log logs/errors
- php_value upload_max_filesize 5M
- php_value post_max_size 6M
- php_value memory_limit 64M
- php_value session.auto_start 0
- php_value zlib.output_compression 0
- php_value magic_quotes_gpc 0
- php_value zend.ze1_compatibility_mode 0
-</IfModule>
+php_flag display_errors Off
+php_flag log_errors On
+php_value error_log logs/errors
+
+php_value upload_max_filesize 5M
+php_value post_max_size 6M
+php_value memory_limit 64M
+
+php_value zlib.output_compression 0
+php_value magic_quotes_gpc 0
+php_value zend.ze1_compatibility_mode 0
+
+php_value session.auto_start 0
+php_value session.gc_maxlifetime 21600
+php_value session.gc_divisor 500
+php_value session.gc_probability 1
<FilesMatch "(\.inc|\~)$">
Order allow,deny
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 5ef5b7db7..5fe10114d 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -53,8 +53,6 @@ if (set_include_path($include_path) === false) {
ini_set('session.name', 'roundcube_sessid');
ini_set('session.use_cookies', 1);
ini_set('session.only_use_cookies', 1);
-ini_set('session.gc_maxlifetime', 21600);
-ini_set('session.gc_divisor', 500);
ini_set('error_reporting', E_ALL&~E_NOTICE);
set_magic_quotes_runtime(0);