Merge pull request #1800 from ginus/patch-1

fix when $_SERVER['HTTPS'] is "ON"
11 years ago · f880bb190c
1 changed files with 2 additions and 2 deletions
--- 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)
+		return isset($_SERVER['HTTPS']) && (strcasecmp($_SERVER['HTTPS'],'on') || $_SERVER['HTTPS'] == 1)
-			|| isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https';
+			|| isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strcasecmp($_SERVER['HTTP_X_FORWARDED_PROTO'],'https');
 	}
 	/**