diff --git a/.htaccess b/.htaccess
index 9048377..81693c6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -23,10 +23,26 @@
ErrorDocument 404 /assets/error-404.html
ErrorDocument 500 /assets/error-500.html
+
+ # Ensure that X-Forwarded-Host is only allowed to determine the request
+ # hostname for servers ips defined by SS_TRUSTED_PROXY_IPS in your _ss_environment.php
+ # Note that in a future release this setting will be always on.
+ SetEnv BlockUntrustedIPs true
+
+
+
+ # Turn off index.php handling requests to the homepage fixes issue in apache >=2.4
+
+ DirectoryIndex disabled
+
+
SetEnv HTTP_MOD_REWRITE On
RewriteEngine On
+ # Enable HTTP Basic authentication workaround for PHP running in CGI mode
+ RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
# Deny access to potentially sensitive files and folders
RewriteRule ^vendor(/|$) - [F,L,NC]
RewriteRule silverstripe-cache(/|$) - [F,L,NC]
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2e1a0fb..0000000
--- a/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This makefile is a secondary way of installing SilverStripe.
-# It is used for things like continuous integration
-#
-# Most users should simply visit the site root in your web browser.
-#
-
-test:
- $(MAKE) QUERYSTRING="$(QUERYSTRING)" -C framework test
\ No newline at end of file
diff --git a/behat.yml b/behat.yml
index 4cfedf9..a1eac35 100644
--- a/behat.yml
+++ b/behat.yml
@@ -1,3 +1,7 @@
+# Behat integration test setup (see behat.org).
+# More information about running these tests can be found under
+# https://github.com/silverstripe-labs/silverstripe-behat-extension.
+# It is safe to remove this file for normal website operation.
default:
filters:
tags: "~@todo"
diff --git a/build.xml b/build.xml
index 7dc8bf4..f5715ff 100644
--- a/build.xml
+++ b/build.xml
@@ -1,15 +1,14 @@
-
diff --git a/composer.json b/composer.json
index 2ace85c..9c6d25c 100644
--- a/composer.json
+++ b/composer.json
@@ -7,10 +7,16 @@
"silverstripe/framework": "self.version",
"silverstripe-themes/simple": "*"
},
+ "require-dev": {
+ "phpunit/PHPUnit": "~3.7@stable"
+ },
"extra": {
"branch-alias": {
"dev-master": "4.0.x-dev"
}
},
+ "config": {
+ "process-timeout": 600
+ },
"minimum-stability": "dev"
}
diff --git a/phpunit.teamcity.postgresql.xml b/phpunit.teamcity.postgresql.xml
deleted file mode 100644
index 81e226f..0000000
--- a/phpunit.teamcity.postgresql.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- mysite/tests
- cms/tests
- framework/tests
- postgresql/tests
-
-
-
-
-
-
-
-
-
- sanitychecks
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/phpunit.teamcity.sqlite3.xml b/phpunit.teamcity.sqlite3.xml
deleted file mode 100644
index ace5768..0000000
--- a/phpunit.teamcity.sqlite3.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- mysite/tests
- cms/tests
- framework/tests
- sqlite3/tests
-
-
-
-
-
-
-
-
-
- sanitychecks
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/phpunit.teamcity.xml b/phpunit.teamcity.xml
deleted file mode 100644
index e2ac1a6..0000000
--- a/phpunit.teamcity.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
- mysite/tests
- cms/tests
- framework/tests
-
-
-
-
-
-
-
-
-
- sanitychecks
-
-
-
-
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1232b66..8a62266 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,6 +13,8 @@
More information:
- http://www.phpunit.de/manual/current/en/textui.html
- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
+
+ It is safe to remove this file for normal website operation.
-->
diff --git a/web.config b/web.config
index 1d0c734..2418f45 100644
--- a/web.config
+++ b/web.config
@@ -1,3 +1,4 @@
+<--! Routing configuration for Microsoft IIS web server -->