From 3a30bc46d931e9dab639cc2abafbaab75c477954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Bajsarowicz?= Date: Fri, 10 Apr 2026 07:21:37 +0200 Subject: [PATCH] fix: remove Apache 2.2 compatibility blocks from htaccess files --- .github/.htaccess | 8 +- .htaccess.sample | 144 +++--------------- app/.htaccess | 9 +- bin/.htaccess | 9 +- dev/.htaccess | 9 +- dev/tests/acceptance/.htaccess.sample | 8 +- .../Composer/_files/testFromClone/.htaccess | 8 +- .../_files/testFromClone/cache/.htaccess | 8 +- .../_files/testFromCreateProject/.htaccess | 8 +- .../testFromCreateProject/cache/.htaccess | 8 +- .../Composer/_files/testSkeleton/.htaccess | 8 +- .../_files/testSkeleton/cache/.htaccess | 8 +- generated/.htaccess | 9 +- lib/.htaccess | 9 +- phpserver/.htaccess | 9 +- pub/.htaccess | 32 +--- pub/media/custom_options/.htaccess | 8 +- pub/media/customer/.htaccess | 9 +- pub/media/customer_address/.htaccess | 8 +- pub/media/downloadable/.htaccess | 9 +- pub/media/import/.htaccess | 9 +- pub/media/theme_customization/.htaccess | 8 +- setup/.htaccess | 10 +- setup/config/.htaccess | 9 +- setup/performance-toolkit/.htaccess | 9 +- setup/src/.htaccess | 9 +- setup/view/.htaccess | 9 +- var/.htaccess | 9 +- vendor/.htaccess | 8 +- 29 files changed, 50 insertions(+), 358 deletions(-) diff --git a/.github/.htaccess b/.github/.htaccess index 76952375b2eba..b66e808829670 100644 --- a/.github/.htaccess +++ b/.github/.htaccess @@ -1,7 +1 @@ - - Order deny,allow - Deny from all - -= 2.4> - Require all denied - +Require all denied diff --git a/.htaccess.sample b/.htaccess.sample index 776f9046cf11d..49ad84ec787f1 100644 --- a/.htaccess.sample +++ b/.htaccess.sample @@ -185,166 +185,58 @@ RedirectMatch 403 /\.git - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied # For 404s and 403s that aren't handled by the application, show plain 404 response diff --git a/app/.htaccess b/app/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/app/.htaccess +++ b/app/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/bin/.htaccess b/bin/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/bin/.htaccess +++ b/bin/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/dev/.htaccess b/dev/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/dev/.htaccess +++ b/dev/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/dev/tests/acceptance/.htaccess.sample b/dev/tests/acceptance/.htaccess.sample index e6bb9dd7ddab9..2a87f19a657aa 100644 --- a/dev/tests/acceptance/.htaccess.sample +++ b/dev/tests/acceptance/.htaccess.sample @@ -1,11 +1,5 @@ ############################################## ## Allow access to command.php - - order allow,deny - allow from all - - = 2.4> - Require all granted - + Require all granted diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/.htaccess b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/.htaccess index 118789f3d955b..b66e808829670 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/.htaccess +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/.htaccess @@ -1,7 +1 @@ - - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/cache/.htaccess b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/cache/.htaccess index 118789f3d955b..b66e808829670 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/cache/.htaccess +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/cache/.htaccess @@ -1,7 +1 @@ - - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/.htaccess b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/.htaccess index 118789f3d955b..b66e808829670 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/.htaccess +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/.htaccess @@ -1,7 +1 @@ - - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/cache/.htaccess b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/cache/.htaccess index 118789f3d955b..b66e808829670 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/cache/.htaccess +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/cache/.htaccess @@ -1,7 +1 @@ - - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/.htaccess b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/.htaccess index 118789f3d955b..b66e808829670 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/.htaccess +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/.htaccess @@ -1,7 +1 @@ - - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/cache/.htaccess b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/cache/.htaccess index 118789f3d955b..b66e808829670 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/cache/.htaccess +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/cache/.htaccess @@ -1,7 +1 @@ - - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/generated/.htaccess b/generated/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/generated/.htaccess +++ b/generated/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/lib/.htaccess b/lib/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/lib/.htaccess +++ b/lib/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/phpserver/.htaccess b/phpserver/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/phpserver/.htaccess +++ b/phpserver/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/pub/.htaccess b/pub/.htaccess index 1b5d7e007000f..fcee1b0c12bf6 100644 --- a/pub/.htaccess +++ b/pub/.htaccess @@ -205,42 +205,18 @@ ## Deny access to release notes to prevent disclosure of the installed Magento version - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied ## Deny access to cron.php - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied ## Deny access to .user.ini - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied # For 404s and 403s that aren't handled by the application, show plain 404 response diff --git a/pub/media/custom_options/.htaccess b/pub/media/custom_options/.htaccess index 87cd9785472ac..b66e808829670 100644 --- a/pub/media/custom_options/.htaccess +++ b/pub/media/custom_options/.htaccess @@ -1,7 +1 @@ - - order deny,allow - deny from all - -= 2.4> - Require all denied - +Require all denied diff --git a/pub/media/customer/.htaccess b/pub/media/customer/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/pub/media/customer/.htaccess +++ b/pub/media/customer/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/pub/media/customer_address/.htaccess b/pub/media/customer_address/.htaccess index b97408bad3f2e..b66e808829670 100644 --- a/pub/media/customer_address/.htaccess +++ b/pub/media/customer_address/.htaccess @@ -1,7 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - +Require all denied diff --git a/pub/media/downloadable/.htaccess b/pub/media/downloadable/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/pub/media/downloadable/.htaccess +++ b/pub/media/downloadable/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/pub/media/import/.htaccess b/pub/media/import/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/pub/media/import/.htaccess +++ b/pub/media/import/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/pub/media/theme_customization/.htaccess b/pub/media/theme_customization/.htaccess index 2b93da6b4c079..c659371c6791d 100644 --- a/pub/media/theme_customization/.htaccess +++ b/pub/media/theme_customization/.htaccess @@ -1,10 +1,4 @@ Options -Indexes - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied diff --git a/setup/.htaccess b/setup/.htaccess index 582ee8f488d0e..956c20b3ad231 100644 --- a/setup/.htaccess +++ b/setup/.htaccess @@ -1,13 +1,7 @@ # If you want to enable the web based setup functionality, add your ip address -# to the allow list below or comment out the IfVersion Deny deny blocks below. +# to the allow list below or comment out the Deny blocks below. - - order allow,deny - deny from all - - = 2.4> - Require all denied - + Require all denied Options -Indexes diff --git a/setup/config/.htaccess b/setup/config/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/setup/config/.htaccess +++ b/setup/config/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/setup/performance-toolkit/.htaccess b/setup/performance-toolkit/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/setup/performance-toolkit/.htaccess +++ b/setup/performance-toolkit/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/setup/src/.htaccess b/setup/src/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/setup/src/.htaccess +++ b/setup/src/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/setup/view/.htaccess b/setup/view/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/setup/view/.htaccess +++ b/setup/view/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/var/.htaccess b/var/.htaccess index 707c26b075e16..b66e808829670 100644 --- a/var/.htaccess +++ b/var/.htaccess @@ -1,8 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - - +Require all denied diff --git a/vendor/.htaccess b/vendor/.htaccess index b97408bad3f2e..b66e808829670 100644 --- a/vendor/.htaccess +++ b/vendor/.htaccess @@ -1,7 +1 @@ - - order allow,deny - deny from all - -= 2.4> - Require all denied - +Require all denied