scheme checking for webservers without $_SERVER['HTTPS']

This commit is contained in:
friendica 2012-03-16 23:51:49 -07:00
parent 2785bb413e
commit 511d8a30a0
1 changed files with 6 additions and 1 deletions

View File

@ -286,7 +286,12 @@ class App {
startup(); 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')) { if(x($_SERVER,'SERVER_NAME')) {
$this->hostname = $_SERVER['SERVER_NAME']; $this->hostname = $_SERVER['SERVER_NAME'];