tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7388 from open-sausages/pulls/4.0/fix-base-absolute-url

Browse Source 
BUG Detect, warn, and fix invalid SS_BASE_URL
This commit is contained in:
Chris Joe 2017-09-20 14:32:18 +12:00 committed by GitHub
commit 0e10412b86
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/en/04_Changelogs/4.0.0.md
View File

@ -418,6 +418,13 @@ variable set-up process. This generally encouraged bad practice and should be av
logic early in the bootstrap, this is best placed in the `_config.php` files.
Note also that `$_FILE_TO_URL_MAPPING` has been removed and replaced with `SS_BASE_URL` env var.
This url must be an absolute url with an optional protocol. The following are valid, for example:
```
SS_BASE_URL="http://localhost/"
SS_BASE_URL="https://localhost/"
SS_BASE_URL="//localhost/"
```
The global values `$database` and `$databaseConfig` have been deprecated, as has `ConfigureFromEnv.php`
which is no longer necessary.

2
src/Control/ContentNegotiator.php
View File

@ -136,7 +136,7 @@ class ContentNegotiator
}
$negotiator = new ContentNegotiator();
$negotiator->$chosenFormat( $response );
$negotiator->$chosenFormat($response);
}
/**

14
src/includes/constants.php
View File

@ -72,6 +72,20 @@ if (!getenv('SS_IGNORE_DOT_ENV')) {
});
}
// Validate SS_BASE_URL is absolute
if (getenv('SS_BASE_URL') && !preg_match('#^(\w+:)?//.*#', getenv('SS_BASE_URL'))) {
call_user_func(function () {
$base = getenv('SS_BASE_URL');
user_error(
"SS_BASE_URL should be an absolute url with protocol "
. "(http://$base) or without protocol (//$base)",
E_USER_WARNING
);
// Treat as protocol-less absolute url
$base = '//' . $base;
putenv("SS_BASE_URL=$base");
});
}
if (!defined('BASE_URL')) {
define('BASE_URL', call_user_func(function () {