Merge commit 'debian/0.1_rc2-2' into debian

[roundcube.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index 9474105deebc1b20727adaf9a95ffaeeed5c8e3f..b40b7ea8a5a909ece100624095dd5252e6130c77 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,10 +1,23 @@
 # AddDefaultCharset    UTF-8
-php_flag       display_errors  Off
-php_flag       log_errors      On
-php_value      error_log       logs/errors
-php_value      upload_max_filesize     2M
+AddType text/x-component .htc
 
-<FilesMatch "(\.inc|\~)$|^_">
+<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>
+
+<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>
+
+<FilesMatch "(\.inc|\~)$">
   Order allow,deny
   Deny from all
 </FilesMatch>