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

Conflicts: build.xml composer.json install.php phpunit.xml.dist
silverstripe · Feb 15, 2013 · 494bfc7 · 494bfc7
2 parents 5d78b04 + 2352317
commit 494bfc7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.htaccess b/.htaccess
@@ -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>

diff --git a/composer.json b/composer.json
@@ -14,4 +14,4 @@
 		"phpunit/phpunit": "3.7.*"
 	},
 	"minimum-stability": "dev"
-}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -25,7 +25,7 @@
 	<listeners>
 		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
 	</listeners>
-
+	
 	<groups>
 		<exclude>
 			<group>sanitychecks</group>

diff --git a/web.config b/web.config
@@ -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>