Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/2419/head
Alex Pott 2020-04-17 12:46:12 +01:00
parent a4ddcd27c6
commit a585dd6a7e
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.htaccess
View File

@ -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.

3
composer/Plugin/VendorHardening/FileSecurity.php
View File

@ -74,9 +74,6 @@ SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
</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>

11
core/assets/scaffold/files/htaccess
View File

@ -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.

3
core/lib/Drupal/Component/FileSecurity/FileSecurity.php
View File

@ -72,9 +72,6 @@ SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
</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>