Unverified Commit c73845e2 authored by alexpott's avatar alexpott
Browse files

Issue #2455465 by stefan.r, Darren Oh, cosmicdreams, longwave, benjy,...

Issue #2455465 by stefan.r, Darren Oh, cosmicdreams, longwave, benjy, alexpott: Add mod_php7 check to htaccess and remove php5 code

(cherry picked from commit a585dd6a)
parent 668e8785
...@@ -27,16 +27,9 @@ AddEncoding gzip svgz ...@@ -27,16 +27,9 @@ AddEncoding gzip svgz
# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be # Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
# changed at runtime. # changed at runtime.
# PHP 5, Apache 1 and 2. # PHP 7, Apache 1 and 2.
<IfModule mod_php5.c> <IfModule mod_php7.c>
php_value assert.active 0 php_value assert.active 0
php_flag session.auto_start off
php_value mbstring.http_input pass
php_value mbstring.http_output pass
php_flag mbstring.encoding_translation off
# PHP 5.6 has deprecated $HTTP_RAW_POST_DATA and produces warnings if this is
# not set.
php_value always_populate_raw_post_data -1
</IfModule> </IfModule>
# Requires mod_expires to be enabled. # Requires mod_expires to be enabled.
......
...@@ -74,9 +74,6 @@ protected static function htaccessPreventExecution() { ...@@ -74,9 +74,6 @@ protected static function htaccessPreventExecution() {
</Files> </Files>
# If we know how to do it safely, disable the PHP engine entirely. # If we know how to do it safely, disable the PHP engine entirely.
<IfModule mod_php5.c>
php_flag engine off
</IfModule>
<IfModule mod_php7.c> <IfModule mod_php7.c>
php_flag engine off php_flag engine off
</IfModule> </IfModule>
......
...@@ -27,16 +27,9 @@ AddEncoding gzip svgz ...@@ -27,16 +27,9 @@ AddEncoding gzip svgz
# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be # Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
# changed at runtime. # changed at runtime.
# PHP 5, Apache 1 and 2. # PHP 7, Apache 1 and 2.
<IfModule mod_php5.c> <IfModule mod_php7.c>
php_value assert.active 0 php_value assert.active 0
php_flag session.auto_start off
php_value mbstring.http_input pass
php_value mbstring.http_output pass
php_flag mbstring.encoding_translation off
# PHP 5.6 has deprecated $HTTP_RAW_POST_DATA and produces warnings if this is
# not set.
php_value always_populate_raw_post_data -1
</IfModule> </IfModule>
# Requires mod_expires to be enabled. # Requires mod_expires to be enabled.
......
...@@ -72,9 +72,6 @@ protected static function htaccessPreventExecution() { ...@@ -72,9 +72,6 @@ protected static function htaccessPreventExecution() {
</Files> </Files>
# If we know how to do it safely, disable the PHP engine entirely. # If we know how to do it safely, disable the PHP engine entirely.
<IfModule mod_php5.c>
php_flag engine off
</IfModule>
<IfModule mod_php7.c> <IfModule mod_php7.c>
php_flag engine off php_flag engine off
</IfModule> </IfModule>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment