summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Passas <cpassas@gmail.com>2013-02-12 22:58:38 +0100
committerChris Passas <cpassas@gmail.com>2013-02-15 21:03:28 +0100
commitce6f43b7120a184aa0cff0bdb90fa3d7f032e14b (patch)
tree9a0c9602b45f0f25c4ee0363dca11defc3bb9090
parent8d8636778ac600176772c4d54321a1e0842e5b07 (diff)
Update system/core/Common.php
If using nginx instead of apache by default nginx will not populate the $_SERVER['HTTPS'] value.  This change allows falling back to checking the port number of the request to determine if your on SSL or not. The other option is adding the following to your nginx config. fastcgi_param HTTPS on; #some php apps require this to detent https
-rw-r--r--system/core/Common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 258cd4967..b9c872748 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -343,7 +343,7 @@ if ( ! function_exists('is_https'))
*/
function is_https()
{
- return ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off');
+ return ( ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ) || ($_SERVER["SERVER_PORT"] === '443') );
}
}
@@ -713,4 +713,4 @@ if ( ! function_exists('function_usable'))
}
/* End of file Common.php */
-/* Location: ./system/core/Common.php */ \ No newline at end of file
+/* Location: ./system/core/Common.php */