From ea73d58913874e6dab2345910cc51879a32a71bf Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 08:43:06 -0400
Subject: [PATCH] Fix PHP warning when password_hosts is set, but is not an array (#5260)
---
.htaccess | 80 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/.htaccess b/.htaccess
index c98c30a..d64a325 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,31 +1,59 @@
-# 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 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 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
-
-<FilesMatch "(\.inc|\~)$">
- Order allow,deny
- Deny from all
-</FilesMatch>
-
-<IfModule mod_alias.c>
- Redirect /favicon.ico /skins/default/images/favicon.ico
+#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>
-Order deny,allow
-Allow from all
+<IfModule mod_rewrite.c>
+Options +FollowSymLinks
+RewriteEngine On
+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|\.well-known\/|[a-zA-Z0-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>
+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
+# for better privacy/security ask browsers to not set the Referer
+#Header set Content-Security-Policy "referrer no-referrer"
+</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