Skip to content

Commit 64943cd

Browse files
jonashremjonashrem
committed
close #10810
Migrates Apache Access Syntax to 2.4 on Apaxhe >= 2.4
1 parent 08ec8ce commit 64943cd

File tree

24 files changed

+309
-78
lines changed

24 files changed

+309
-78
lines changed

‎.htaccess

Lines changed: 126 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -203,76 +203,166 @@
203203
RedirectMatch 403 /\.git
204204

205205
<Files composer.json>
206-
order allow,deny
207-
deny from all
206+
<IfVersion < 2.4>
207+
order allow,deny
208+
deny from all
209+
</IfVersion>
210+
<IfVersion >= 2.4>
211+
Require all denied
212+
</IfVersion>
208213
</Files>
209214
<Files composer.lock>
210-
order allow,deny
211-
deny from all
215+
<IfVersion < 2.4>
216+
order allow,deny
217+
deny from all
218+
</IfVersion>
219+
<IfVersion >= 2.4>
220+
Require all denied
221+
</IfVersion>
212222
</Files>
213223
<Files .gitignore>
214-
order allow,deny
215-
deny from all
224+
<IfVersion < 2.4>
225+
order allow,deny
226+
deny from all
227+
</IfVersion>
228+
<IfVersion >= 2.4>
229+
Require all denied
230+
</IfVersion>
216231
</Files>
217232
<Files .htaccess>
218-
order allow,deny
219-
deny from all
233+
<IfVersion < 2.4>
234+
order allow,deny
235+
deny from all
236+
</IfVersion>
237+
<IfVersion >= 2.4>
238+
Require all denied
239+
</IfVersion>
220240
</Files>
221241
<Files .htaccess.sample>
222-
order allow,deny
223-
deny from all
242+
<IfVersion < 2.4>
243+
order allow,deny
244+
deny from all
245+
</IfVersion>
246+
<IfVersion >= 2.4>
247+
Require all denied
248+
</IfVersion>
224249
</Files>
225250
<Files .php_cs.dist>
226-
order allow,deny
227-
deny from all
251+
<IfVersion < 2.4>
252+
order allow,deny
253+
deny from all
254+
</IfVersion>
255+
<IfVersion >= 2.4>
256+
Require all denied
257+
</IfVersion>
228258
</Files>
229259
<Files .travis.yml>
230-
order allow,deny
231-
deny from all
260+
<IfVersion < 2.4>
261+
order allow,deny
262+
deny from all
263+
</IfVersion>
264+
<IfVersion >= 2.4>
265+
Require all denied
266+
</IfVersion>
232267
</Files>
233268
<Files CHANGELOG.md>
234-
order allow,deny
235-
deny from all
269+
<IfVersion < 2.4>
270+
order allow,deny
271+
deny from all
272+
</IfVersion>
273+
<IfVersion >= 2.4>
274+
Require all denied
275+
</IfVersion>
236276
</Files>
237277
<Files CONTRIBUTING.md>
238-
order allow,deny
239-
deny from all
278+
<IfVersion < 2.4>
279+
order allow,deny
280+
deny from all
281+
</IfVersion>
282+
<IfVersion >= 2.4>
283+
Require all denied
284+
</IfVersion>
240285
</Files>
241286
<Files COPYING.txt>
242-
order allow,deny
243-
deny from all
287+
<IfVersion < 2.4>
288+
order allow,deny
289+
deny from all
290+
</IfVersion>
291+
<IfVersion >= 2.4>
292+
Require all denied
293+
</IfVersion>
244294
</Files>
245295
<Files Gruntfile.js>
246-
order allow,deny
247-
deny from all
296+
<IfVersion < 2.4>
297+
order allow,deny
298+
deny from all
299+
</IfVersion>
300+
<IfVersion >= 2.4>
301+
Require all denied
302+
</IfVersion>
248303
</Files>
249304
<Files LICENSE.txt>
250-
order allow,deny
251-
deny from all
305+
<IfVersion < 2.4>
306+
order allow,deny
307+
deny from all
308+
</IfVersion>
309+
<IfVersion >= 2.4>
310+
Require all denied
311+
</IfVersion>
252312
</Files>
253313
<Files LICENSE_AFL.txt>
254-
order allow,deny
255-
deny from all
314+
<IfVersion < 2.4>
315+
order allow,deny
316+
deny from all
317+
</IfVersion>
318+
<IfVersion >= 2.4>
319+
Require all denied
320+
</IfVersion>
256321
</Files>
257322
<Files nginx.conf.sample>
258-
order allow,deny
259-
deny from all
323+
<IfVersion < 2.4>
324+
order allow,deny
325+
deny from all
326+
</IfVersion>
327+
<IfVersion >= 2.4>
328+
Require all denied
329+
</IfVersion>
260330
</Files>
261331
<Files package.json>
262-
order allow,deny
263-
deny from all
332+
<IfVersion < 2.4>
333+
order allow,deny
334+
deny from all
335+
</IfVersion>
336+
<IfVersion >= 2.4>
337+
Require all denied
338+
</IfVersion>
264339
</Files>
265340
<Files php.ini.sample>
266-
order allow,deny
267-
deny from all
341+
<IfVersion < 2.4>
342+
order allow,deny
343+
deny from all
344+
</IfVersion>
345+
<IfVersion >= 2.4>
346+
Require all denied
347+
</IfVersion>
268348
</Files>
269349
<Files README.md>
270-
order allow,deny
271-
deny from all
350+
<IfVersion < 2.4>
351+
order allow,deny
352+
deny from all
353+
</IfVersion>
354+
<IfVersion >= 2.4>
355+
Require all denied
356+
</IfVersion>
272357
</Files>
273358
<Files magento_umask>
274-
order allow,deny
275-
deny from all
359+
<IfVersion < 2.4>
360+
order allow,deny
361+
deny from all
362+
</IfVersion>
363+
<IfVersion >= 2.4>
364+
Require all denied
365+
</IfVersion>
276366
</Files>
277367

278368
# For 404s and 403s that aren't handled by the application, show plain 404 response

‎app/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎bin/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎dev/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/.htaccess

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
Deny from all
1+
<IfVersion < 2.4>
2+
deny from all
3+
</IfVersion>
4+
<IfVersion >= 2.4>
5+
Require all denied
6+
</IfVersion>
7+

‎dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/cache/.htaccess

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
Deny from all
1+
<IfVersion < 2.4>
2+
deny from all
3+
</IfVersion>
4+
<IfVersion >= 2.4>
5+
Require all denied
6+
</IfVersion>
7+

‎dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/.htaccess

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
Deny from all
1+
<IfVersion < 2.4>
2+
deny from all
3+
</IfVersion>
4+
<IfVersion >= 2.4>
5+
Require all denied
6+
</IfVersion>
7+

‎dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/cache/.htaccess

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
Deny from all
1+
<IfVersion < 2.4>
2+
deny from all
3+
</IfVersion>
4+
<IfVersion >= 2.4>
5+
Require all denied
6+
</IfVersion>
7+

‎dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/.htaccess

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
Deny from all
1+
<IfVersion < 2.4>
2+
deny from all
3+
</IfVersion>
4+
<IfVersion >= 2.4>
5+
Require all denied
6+
</IfVersion>
7+

‎dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/cache/.htaccess

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
Deny from all
1+
<IfVersion < 2.4>
2+
deny from all
3+
</IfVersion>
4+
<IfVersion >= 2.4>
5+
Require all denied
6+
</IfVersion>
7+

‎generated/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎lib/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎phpserver/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎pub/.htaccess

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,13 @@
190190
## Deny access to release notes to prevent disclosure of the installed Magento version
191191

192192
<Files RELEASE_NOTES.txt>
193-
order allow,deny
194-
deny from all
193+
<IfVersion < 2.4>
194+
order allow,deny
195+
deny from all
196+
</IfVersion>
197+
<IfVersion >= 2.4>
198+
Require all denied
199+
</IfVersion>
195200
</Files>
196201

197202
# For 404s and 403s that aren't handled by the application, show plain 404 response
@@ -207,8 +212,13 @@ ErrorDocument 403 /errors/404.php
207212
###########################################
208213
## Deny access to cron.php
209214
<Files cron.php>
210-
order allow,deny
211-
deny from all
215+
<IfVersion < 2.4>
216+
order allow,deny
217+
deny from all
218+
</IfVersion>
219+
<IfVersion >= 2.4>
220+
Require all denied
221+
</IfVersion>
212222
</Files>
213223

214224
<IfModule mod_headers.c>

‎pub/media/customer/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎pub/media/downloadable/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

‎pub/media/import/.htaccess

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
Order deny,allow
2-
Deny from all
1+
<IfVersion < 2.4>
2+
order allow,deny
3+
deny from all
4+
</IfVersion>
5+
<IfVersion >= 2.4>
6+
Require all denied
7+
</IfVersion>
8+

0 commit comments

Comments
 (0)