Enhanced the detection of secure connection.

b2e7aa31 · Qiang Xue · cc7c6c7a · b2e7aa31
Commit b2e7aa31 authored May 20, 2013 by Qiang Xue
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

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

 	/**