php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 07:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue #457: incorrect HTTPS detection.

Browse Source
This commit is contained in:
Qiang Xue
2013-05-29 21:53:25 -04:00
parent f3cfc60d6c
commit 66e698673d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/db/Connection.php
View File

@@ -251,7 +251,7 @@ class Connection extends Component
*/ */
private $_schema; private $_schema;
/** /**
* Returns a value indicating whether the DB connection is established. * Returns a value indicating whether the DB connection is established.
* @return boolean whether the DB connection is established * @return boolean whether the DB connection is established

4
framework/yii/web/Request.php
View File

@@ -533,8 +533,8 @@ class Request extends \yii\base\Request
*/ */
public function getIsSecureConnection() public function getIsSecureConnection()
{ {
return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') return isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] == 1)
|| isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO']==='https'; || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https';
} }
/** /**