Merge pull request #1800 from ginus/patch-1

fix when $_SERVER['HTTPS'] is "ON"

Merge pull request #1800 from ginus/patch-1
f880bb19 · Alexander Makarov · 13849e75 · e92934e6 · f880bb19
Commit f880bb19 authored Jan 06, 2014 by Alexander Makarov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Request.php framework/yii/web/Request.php +2 -2

No files found.
--- a/framework/yii/web/Request.php
+++ b/framework/yii/web/Request.php
@@ -668,8 +668,8 @@ class Request extends \yii\base\Request
 	 */
 	public function getIsSecureConnection()
 	{
-		return isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] == 1)
-			|| isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https';
+		return isset($_SERVER['HTTPS']) && (strcasecmp($_SERVER['HTTPS'],'on') || $_SERVER['HTTPS'] == 1)
+			|| isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strcasecmp($_SERVER['HTTP_X_FORWARDED_PROTO'],'https');
 	}

 	/**