diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:51:19 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:51:19 +0100 |
| commit | 7ee1f0f21fcae03df584918fa2233c865ca01d25 (patch) | |
| tree | ecda63633774e9a428e0e10c832159243f78ba2a | |
| parent | a7c0656a530ca405d2ed18b8e9bd252975bb8505 (diff) | |
| parent | 27c80af1dd9b871ab44452a8de22fd9cabaa184c (diff) | |
Merge upstream
| -rwxr-xr-x | system/core/Config.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 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']); } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index c077c97b8..70ede7128 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -99,6 +99,7 @@ Bug fixes for 3.0 - In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url - Fixed a bug (#561) - Errors in :doc:`XML-RPC Library <libraries/xmlrpc>` were not properly escaped. - Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used. +- Fixed a hosting edge case where an empty $_SERVER['HTTPS'] variable would evaluate to 'on' - Fixed a bug in CI_DB_driver::version() where it failed when using a database driver that needs to run a query in order to get the version. Version 2.1.0 |