summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2010-12-15 15:29:21 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2010-12-15 15:29:21 +0100
commitfb5523855cb0592abe8e8720d7019fa82acfb054 (patch)
tree17db6e322a51c388234502220dccef9268543ca9
parent4df8b2276bbcc7f025a41b0d09f2f8cd7927b51a (diff)
Revised the base_url auto-generation detection of protocol as some servers will not send off.
-rw-r--r--system/core/Config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index 506af0d99..081f1d899 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -54,7 +54,7 @@ class CI_Config {
// Base URL (keeps this crazy sh*t out of the config.php
if(isset($_SERVER['HTTP_HOST']))
{
- $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ? 'https' : 'http';
+ $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
$base_url .= '://'. $_SERVER['HTTP_HOST'];
$base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
}