diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-11-04 14:43:11 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-11-04 14:43:11 +0100 |
| commit | 66a8940823b8ce9cd9e0bfe5d4263008a437a422 (patch) | |
| tree | 0d02a82cce7adfbfeee51e2a4a7257c74f906551 /system/core/Config.php | |
| parent | 175b17c4b74d03a7578440d92a3ac9d80924ef78 (diff) | |
| parent | ab3c383fb3535e55253271f210870cd9361d94c9 (diff) | |
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system/core/Config.php')
| -rw-r--r-- | system/core/Config.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index feea7c85a..0264776f9 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -88,11 +88,9 @@ class CI_Config { // Set the base_url automatically if none was provided if (empty($this->config['base_url'])) { - // The regular expression is only a basic validation for a valid "Host" header. - // It's not exhaustive, only checks for valid characters. - if (isset($_SERVER['HTTP_HOST']) && preg_match('/^((\[[0-9a-f:]+\])|(\d{1,3}(\.\d{1,3}){3})|[a-z0-9\-\.]+)(:\d+)?$/i', $_SERVER['HTTP_HOST'])) + if (isset($_SERVER['SERVER_ADDR'])) { - $base_url = (is_https() ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'] + $base_url = (is_https() ? 'https' : 'http').'://'.$_SERVER['SERVER_ADDR'] .substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME']))); } else |