Skip to content

fix: remove Apache 2.2 compatibility blocks from htaccess files #40683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lbajsarowicz wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open

fix: remove Apache 2.2 compatibility blocks from htaccess files #40683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
Order deny,allow
Deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
144 changes: 18 additions & 126 deletions .htaccess.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,166 +185,58 @@
RedirectMatch 403 /\.git

<Files composer.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files composer.lock>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files .gitignore>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files .htaccess>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files .htaccess.sample>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files .php_cs.dist>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files CHANGELOG.md>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files COPYING.txt>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files Gruntfile.js>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files LICENSE.txt>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files LICENSE_AFL.txt>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files nginx.conf.sample>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files package.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files php.ini.sample>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files README.md>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files magento_umask>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files auth.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files .user.ini>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
Expand Down
9 changes: 1 addition & 8 deletions app/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
9 changes: 1 addition & 8 deletions bin/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
9 changes: 1 addition & 8 deletions dev/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
8 changes: 1 addition & 7 deletions dev/tests/acceptance/.htaccess.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
##############################################
## Allow access to command.php
<FilesMatch "command.php">
<IfVersion < 2.4>
order allow,deny
allow from all
</IfVersion>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
Require all granted
</FilesMatch>
8 changes: 1 addition & 7 deletions dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
8 changes: 1 addition & 7 deletions ...sts/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/cache/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
8 changes: 1 addition & 7 deletions ...s/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
8 changes: 1 addition & 7 deletions ...gration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/cache/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
8 changes: 1 addition & 7 deletions dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
8 changes: 1 addition & 7 deletions ...ests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/cache/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
9 changes: 1 addition & 8 deletions generated/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
9 changes: 1 addition & 8 deletions lib/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
9 changes: 1 addition & 8 deletions phpserver/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
32 changes: 4 additions & 28 deletions pub/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,42 +205,18 @@
## Deny access to release notes to prevent disclosure of the installed Magento version

<Files RELEASE_NOTES.txt>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
<Files .htaccess>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
## Deny access to cron.php
<Files cron.php>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>
## Deny access to .user.ini
<Files .user.ini>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
Expand Down
8 changes: 1 addition & 7 deletions pub/media/custom_options/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
order deny,allow
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
9 changes: 1 addition & 8 deletions pub/media/customer/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Require all denied
8 changes: 1 addition & 7 deletions pub/media/customer_address/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
Require all denied
Loading