diff options
| author | friendica <info@friendica.com> | 2015-01-05 16:14:56 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-05 16:14:56 -0800 |
| commit | 2dca165f9b0a80ceca562a132868c9f934822f3e (patch) | |
| tree | 40bc0bbabc58f8e30566d331c284c3f815075988 | |
| parent | 8a3ef177cefe12e80a1cf121cfbc29d15ffa4735 (diff) | |
| parent | 3185bfe3ca131d471b8fcdc0c94abf1a114486c7 (diff) | |
| download | volse-hubzilla-2dca165f9b0a80ceca562a132868c9f934822f3e.tar.gz volse-hubzilla-2dca165f9b0a80ceca562a132868c9f934822f3e.tar.bz2 volse-hubzilla-2dca165f9b0a80ceca562a132868c9f934822f3e.zip | |
Merge branch 'master' into trinidad
| -rwxr-xr-x | include/plugin.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/plugin.php b/include/plugin.php index e500ccc56..08decc8e3 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -472,6 +472,8 @@ function script_path() { $scheme = 'https'; elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) $scheme = 'https'; + elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') + $scheme = 'https'; else $scheme = 'http'; |