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

code/staticpublisher/FilesystemPublisher.php

@@ -186,11 +186,12 @@ class FilesystemPublisher extends StaticPublisher {
 			$response = Director::test(str_replace('+', ' ', $url));
 			
 			Requirements::clear();
-			
-			
-			
+
 			singleton('DataObject')->flushCache();
 
+			//skip any responses with a 404 status code. We don't want to turn those into statically cached pages
+			if (!$response || $response->getStatusCode() == '404') continue;
+
 			// Generate file content			
 			// PHP file caching will generate a simple script from a template
 			if($this->fileExtension == 'php') {

composer.json

@@ -0,0 +1,23 @@
+{
+	"name": "silverstripe/cms",
+	"description": "The SilverStripe Content Management System",
+	"type": "silverstripe-module",
+	"keywords": ["silverstripe", "cms"],
+	"homepage": "http://silverstripe.org/cms",
+	"license": "BSD-3-Clause",
+	"authors": [
+		{
+			"name": "SilverStripe",
+			"homepage": "http://silverstripe.com"
+		},
+		{
+			"name": "The SilverStripe Community",
+			"homepage": "http://silverstripe.org"
+		}
+	],
+	"require": {
+		"php": ">=5.2.4",
+		"composer/installers": "*",
+		"silverstripe/framework": "self.version"
+	}
+}