From 7085f074d24cee52ece36dfa3307af3c3d060e23 Mon Sep 17 00:00:00 2001
From: colymba <thierry@colymba.com>
Date: Sat, 20 Apr 2013 10:31:47 +0300
Subject: [PATCH 1/2] BUGFIX #34 Only block root vendor folder

Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.

Move to RewriteRules
---
 .htaccess | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.htaccess b/.htaccess
index 132464b..5de56ed 100644
--- a/.htaccess
+++ b/.htaccess
@@ -20,15 +20,13 @@
 ErrorDocument 404 /assets/error-404.html
 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>
 	SetEnv HTTP_MOD_REWRITE On
-	RewriteEngine On
+	RewriteEngine On	
+
+	RewriteRule ^vendor(/|$) - [F,L,NC]
+	RewriteRule silverstripe-cache(/|$) - [F,L,NC]
+	RewriteRule composer\.(json|lock) - [F,L,NC]
 
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f

From 10dc891fee9fb1bd1bca6c7ffaea742fb6eb365a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 16 Jun 2014 08:41:43 +1200
Subject: [PATCH 2/2] Removed goutte driver from Behat, not supported

Was added way back with the original behat.yml, and then forgotten about
---
 behat.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/behat.yml b/behat.yml
index 3016be6..6759021 100644
--- a/behat.yml
+++ b/behat.yml
@@ -16,7 +16,6 @@ default:
       files_path: %behat.paths.base%/framework/tests/behat/features/files/
       default_session: selenium2
       javascript_session: selenium2
-      goutte: ~
       selenium2:
         browser: firefox