Handle incorrect upgrade from 0.3.1-6 when "changed" column already

[roundcube.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index b40b7ea8a5a909ece100624095dd5252e6130c77..704779e2e9b7844bb9e39199a936a0a7b6c564fb 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,26 +1,50 @@
 # 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
+<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_flag       zlib.output_compression         Off
+php_flag       magic_quotes_gpc                Off
+php_flag       magic_quotes_runtime            Off
+php_flag       zend.ze1_compatibility_mode     Off
+php_flag       suhosin.session.encrypt         Off
+
+#php_value     session.cookie_path             /
+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>
 
-<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
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
 </IfModule>
 
-<FilesMatch "(\.inc|\~)$">
-  Order allow,deny
-  Deny from all
-</FilesMatch>
+<IfModule mod_deflate.c>
+SetOutputFilter DEFLATE
+</IfModule>
+
+<IfModule mod_headers.c>
+# replace 'append' with 'merge' for Apache version 2.2.9 and later
+#Header append Cache-Control public env=!NO_CACHE
+</IfModule>
+
+<IfModule mod_expires.c>
+ExpiresActive On
+ExpiresDefault "access plus 1 month"
+</IfModule>
+
+FileETag MTime Size
+
 
-Order deny,allow
-Allow from all