From 36bd93f1384ccf3f3ccd6fa884ad594d1b486367 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 07 Aug 2015 11:27:08 -0400
Subject: [PATCH] PHP7: Fixed some E_WARNING errors that previously were E_STRICT

---
 .htaccess |   53 +++++++++++++++++++++++++++++------------------------
 1 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/.htaccess b/.htaccess
index 55dad98..c584ac0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,37 +1,42 @@
-# AddDefaultCharset	UTF-8
+# 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_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   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_flag    register_globals            Off
+php_flag    zlib.output_compression     Off
+php_flag    magic_quotes_gpc            Off
+php_flag    magic_quotes_runtime        Off
+php_flag    suhosin.session.encrypt     Off
 
-#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
+#php_value   session.cookie_path     /
+#php_value   session.hash_function   sha256
+php_flag    session.auto_start       Off
+php_value   session.gc_maxlifetime   21600
+php_value   session.gc_divisor       500
+php_value   session.gc_probability   1
 </IfModule>
 
 <IfModule mod_rewrite.c>
+Options +FollowSymLinks
 RewriteEngine On
-RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
-# security rules
-RewriteRule .svn/ - [F]
-RewriteRule ^README|INSTALL|LICENSE|SQL|bin|CHANGELOG$ - [F]
+RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
+
+# security rules:
+# - deny access to files not containing a dot or starting with a dot
+#   in all locations except installer directory
+RewriteRule ^(?!installer|[a-f0-9]{16})(\.?[^\.]+)$ - [F]
+# - deny access to some locations
+RewriteRule ^/?(\.git|\.tx|SQL|bin|config|logs|temp|tests|program\/(include|lib|localization|steps)) - [F]
+# - deny access to some documentation files
+RewriteRule /?(README\.md|composer\.json-dist|composer\.json|package\.xml|Dockerfile)$ - [F]
 </IfModule>
 
 <IfModule mod_deflate.c>

--
Gitblit v1.9.1