Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts:
	build.xml
	composer.json
	install.php
	phpunit.xml.dist
This commit is contained in:
Ingo Schommer 2013-02-15 19:18:57 +01:00
commit 494bfc7863
4 changed files with 17 additions and 3 deletions

View File

@ -15,6 +15,8 @@ ErrorDocument 500 /assets/error-500.html
<IfModule mod_alias.c>
RedirectMatch 403 /silverstripe-cache(/|$)
RedirectMatch 403 /vendor(/|$)
RedirectMatch 403 /composer\.(json|lock)
</IfModule>
<IfModule mod_rewrite.c>

View File

@ -1,5 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
<security>
<requestFiltering>
<hiddenSegments>
<add segment="silverstripe-cache/" />
<add segment="vendor" />
<add segment="composer.json" />
<add segment="composer.lock" />
</hiddenSegments>
<fileExtensions allowUnlisted="true" >
<add fileExtension=".ss" allowed="false"/>
</fileExtensions>
</requestFiltering>
</security>
</system.webServer>
</configuration>