From 4c02ef0c5c23fc31d5d89ccd012698ea325acc1b Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 30 Oct 2013 11:52:54 -0400
Subject: [PATCH] Fix function calls after refactoring

---
 .htaccess |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/.htaccess b/.htaccess
index fcb8f6c..dc6e62f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,34 +4,50 @@
 <IfModule mod_php5.c>
 php_flag	display_errors	Off
 php_flag	log_errors	On
-php_value	error_log	logs/errors
+# 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	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_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.auto_start	0
+#php_value	session.cookie_path		/
+php_flag	session.auto_start	Off
 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|\~)$">
-  Order allow,deny
-  Deny from all
-</FilesMatch>
 
 <IfModule mod_rewrite.c>
 RewriteEngine On
-RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
+RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
+# security rules
+RewriteRule \.git - [F]
+RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ - [F]
+RewriteRule ^/?(SQL|bin) - [F]
 </IfModule>
- 
-Order deny,allow
-Allow from all
+
+<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
+
+<IfModule mod_autoindex.c>
+Options -Indexes
+</ifModule>

--
Gitblit v1.9.1