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:
commit
494bfc7863
|
@ -15,6 +15,8 @@ ErrorDocument 500 /assets/error-500.html
|
||||||
|
|
||||||
<IfModule mod_alias.c>
|
<IfModule mod_alias.c>
|
||||||
RedirectMatch 403 /silverstripe-cache(/|$)
|
RedirectMatch 403 /silverstripe-cache(/|$)
|
||||||
|
RedirectMatch 403 /vendor(/|$)
|
||||||
|
RedirectMatch 403 /composer\.(json|lock)
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
||||||
<IfModule mod_rewrite.c>
|
<IfModule mod_rewrite.c>
|
||||||
|
|
|
@ -14,4 +14,4 @@
|
||||||
"phpunit/phpunit": "3.7.*"
|
"phpunit/phpunit": "3.7.*"
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev"
|
"minimum-stability": "dev"
|
||||||
}
|
}
|
|
@ -25,7 +25,7 @@
|
||||||
<listeners>
|
<listeners>
|
||||||
<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
|
<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
|
||||||
</listeners>
|
</listeners>
|
||||||
|
|
||||||
<groups>
|
<groups>
|
||||||
<exclude>
|
<exclude>
|
||||||
<group>sanitychecks</group>
|
<group>sanitychecks</group>
|
||||||
|
|
14
web.config
14
web.config
|
@ -1,5 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<system.webServer>
|
<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>
|
</system.webServer>
|
||||||
</configuration>
|
</configuration>
|
Loading…
Reference in New Issue