From b64ecf36200a075ed97e73379f5292e2d879ea35 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Mon, 7 Oct 2013 08:20:52 +0000
Subject: [PATCH] evo: proxy patch from auray
---
core/trunk/core/class/Url.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/trunk/core/class/Url.php b/core/trunk/core/class/Url.php
index 515b866f364..a79095e410e 100644
--- a/core/trunk/core/class/Url.php
+++ b/core/trunk/core/class/Url.php
@@ -197,8 +197,9 @@ class Url
{
if(array_key_exists('HTTP_X_FORWARDED_PORT', $_SERVER)) {
return $_SERVER['HTTP_X_FORWARDED_PORT'];
- } else if (array_key_exists('HTTP_X_FORWARDED_HOST', $_SERVER)) {
- return '80';
+ } else if (array_key_exists('HTTP_X_FORWARDED_PROTO', $_SERVER)) {
+ if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {return '443';}
+ else {return '80';}
} else {
return $_SERVER['SERVER_PORT'];
}
--
GitLab