diff options
| author | Ross Duggan <rduggan@engineyard.com> | 2012-01-31 16:47:52 +0100 |
|---|---|---|
| committer | Ross Duggan <rduggan@engineyard.com> | 2012-01-31 16:47:52 +0100 |
| commit | 0a9325c86cd5ccbdfe0c70ffb9bf816c8e15e148 (patch) | |
| tree | 03eb74a3b343e920c326de1b7f1ce6b043f2eeca /system/core | |
| parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff) | |
HTTPS detection fix
More closely follow the wording of the $_SERVER['HTTPS'] description in the PHP manual, which specifies a "non-empty" value rather than "non-null"
Diffstat (limited to 'system/core')
| -rwxr-xr-x | system/core/Config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index 66369115a..68417435d 100755 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -80,7 +80,7 @@ class CI_Config { { if (isset($_SERVER['HTTP_HOST'])) { - $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http'; + $base_url = ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http'; $base_url .= '://'. $_SERVER['HTTP_HOST'] . str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']); } |