diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-17 08:44:36 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-17 08:44:36 +0100 |
| commit | 96da328acf838faff3fe823f3dd7557d16fe1d8b (patch) | |
| tree | fb26adfc9fc61077033fa707fae24ba70ee9876a /boot.php | |
| parent | 74c64ef2d244df47b2bea6527bbeb5cc62ca8845 (diff) | |
| parent | 057a142b8cd01cd8ab6212e9d958989c82dfccc3 (diff) | |
| download | volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.gz volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.tar.bz2 volse-hubzilla-96da328acf838faff3fe823f3dd7557d16fe1d8b.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1282' ); +define ( 'FRIENDICA_VERSION', '2.3.1283' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1132 ); @@ -286,7 +286,12 @@ class App { startup(); - $this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'])) ? 'https' : 'http' ); + $this->scheme = 'http'; + if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) + $this->scheme = 'https'; + elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) + $this->scheme = 'https'; + if(x($_SERVER,'SERVER_NAME')) { $this->hostname = $_SERVER['SERVER_NAME']; |