Skip to content
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

close #10810 Migrates Apache Access Syntax to 2.4 on Apache >= 2.4 #11459

Merged
merged 2 commits into from
Nov 10, 2017
Merged

close #10810 Migrates Apache Access Syntax to 2.4 on Apache >= 2.4 #11459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64943cd
close #10810
jonashrem Oct 14, 2017
00937b1
magento/magento2#11459: Merge branch '2.2-develop' of github.com:mage…
ishakhsuvarov Oct 19, 2017
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
162 changes: 126 additions & 36 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,76 +203,166 @@
RedirectMatch 403 /\.git

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

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

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

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

8 changes: 7 additions & 1 deletion 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 +1,7 @@
Deny from all
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

8 changes: 7 additions & 1 deletion ...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 +1,7 @@
Deny from all
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

8 changes: 7 additions & 1 deletion ...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 +1,7 @@
Deny from all
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

8 changes: 7 additions & 1 deletion ...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 +1,7 @@
Deny from all
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

8 changes: 7 additions & 1 deletion 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 +1,7 @@
Deny from all
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

8 changes: 7 additions & 1 deletion ...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 +1,7 @@
Deny from all
<IfVersion < 2.4>
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

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

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

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

18 changes: 14 additions & 4 deletions pub/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,13 @@
## Deny access to release notes to prevent disclosure of the installed Magento version

<Files RELEASE_NOTES.txt>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
Expand All @@ -207,8 +212,13 @@ ErrorDocument 403 /errors/404.php
###########################################
## Deny access to cron.php
<Files cron.php>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>

<IfModule mod_headers.c>
Expand Down
10 changes: 8 additions & 2 deletions pub/media/customer/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
Order deny,allow
Deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

10 changes: 8 additions & 2 deletions pub/media/downloadable/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
Order deny,allow
Deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

10 changes: 8 additions & 2 deletions pub/media/import/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
Order deny,allow
Deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

Loading