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 a585dd6a7e92a3133b44f2d29d25db93a32f9343)
drupal · Apr 17, 2020 · 826b5a3 · 826b5a3
1 parent ba711fe
commit 826b5a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/assets/scaffold/files/htaccess b/assets/scaffold/files/htaccess
@@ -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.

diff --git a/lib/Drupal/Component/FileSecurity/FileSecurity.php b/lib/Drupal/Component/FileSecurity/FileSecurity.php
@@ -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>