Imported Upstream version 0.2~stable

[roundcube.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index ae20a9af0a3878d0e9f84caf2348bee4f37042ae..fcb8f6c8fd28e7072bc433c6be5cfe55926703d9 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,28 +1,26 @@
 # AddDefaultCharset    UTF-8
 AddType text/x-component .htc
 
-<IfModule mod_php4.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
-</IfModule>
-
 <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_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
+
+# http://bugs.php.net/bug.php?id=30766
+php_value      mbstring.func_overload  0
 </IfModule>
 
 <FilesMatch "(\.inc|\~)$">
@@ -30,5 +28,10 @@ AddType text/x-component .htc
   Deny from all
 </FilesMatch>
 
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
+</IfModule>
+ 
 Order deny,allow
 Allow from all