aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-04-12 18:52:37 +0000
committerMario <mario@mariovavti.com>2021-04-12 18:52:37 +0000
commite4adb881cb32b4e24bb7b6975afe0f4651f61945 (patch)
tree25a4c9e41b6de6bc32bbdcaddc9a4e6c0fad0d8c /Zotlabs
parentd9245566f538711b8692e53a9fa0b59bb2c394d1 (diff)
parentaa2450fae1fe41a6b100d152209f66fb66bc270e (diff)
downloadvolse-hubzilla-e4adb881cb32b4e24bb7b6975afe0f4651f61945.tar.gz
volse-hubzilla-e4adb881cb32b4e24bb7b6975afe0f4651f61945.tar.bz2
volse-hubzilla-e4adb881cb32b4e24bb7b6975afe0f4651f61945.zip
Merge branch 'dev' into 'dev'
Wfinger - check https from http_x_forwarded_proto See merge request hubzilla/core!1940
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wfinger.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 6f2864615..46da7f007 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -20,6 +20,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
$scheme = 'https';
elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
$scheme = 'https';
+ elseif(x($_SERVER,'HTTP_X_FORWARDED_PROTO') && ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'))
+ $scheme = 'https';
$zot = intval($_REQUEST['zot']);