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

Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2013-03-08 10:54:49 +01:00
commit 41761472b2
4 changed files with 27 additions and 2 deletions

View File

@ -10,11 +10,20 @@
Deny from all Deny from all
</Files> </Files>
# This denies access to all yml files, since developers might include sensitive
# information in them. See the docs for work-arounds to serve some yaml files
<Files *.yml>
Order allow,deny
Deny from all
</Files>
ErrorDocument 404 /assets/error-404.html ErrorDocument 404 /assets/error-404.html
ErrorDocument 500 /assets/error-500.html 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>

View File

@ -13,5 +13,8 @@
"silverstripe/buildtools": "*", "silverstripe/buildtools": "*",
"phpunit/phpunit": "3.7.*" "phpunit/phpunit": "3.7.*"
}, },
"config": {
"process-timeout": 600
},
"minimum-stability": "dev" "minimum-stability": "dev"
} }

View File

@ -1,5 +1,18 @@
<?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"/>
<add fileExtension=".yml" allowed="false"/>
</fileExtensions>
</requestFiltering>
</security>
</system.webServer> </system.webServer>
</configuration> </configuration>