Unverified Commit a585dd6a authored by Alex Pott's avatar Alex Pott
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
parent a4ddcd27

.htaccess

+2 −9
Original line number Diff line number Diff line
@@ -27,16 +27,9 @@ AddEncoding gzip svgz 
# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be

# changed at runtime.



# PHP 5, Apache 1 and 2.

<IfModule mod_php5.c>

# PHP 7, Apache 1 and 2.

<IfModule mod_php7.c>

  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>



# Requires mod_expires to be enabled.

composer/Plugin/VendorHardening/FileSecurity.php

+0 −3
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ protected static function htaccessPreventExecution() { 
</Files>



# 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>

  php_flag engine off

</IfModule>

core/assets/scaffold/files/htaccess

+2 −9
Original line number Diff line number Diff line
@@ -27,16 +27,9 @@ AddEncoding gzip svgz 
# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be

# changed at runtime.



# PHP 5, Apache 1 and 2.

<IfModule mod_php5.c>

# PHP 7, Apache 1 and 2.

<IfModule mod_php7.c>

  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>



# Requires mod_expires to be enabled.

core/lib/Drupal/Component/FileSecurity/FileSecurity.php

+0 −3
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ protected static function htaccessPreventExecution() { 
</Files>



# 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>

  php_flag engine off

</IfModule>