From e8c11c4a5854d7665f4407feee3673e31d917bd5 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 26 Jul 2010 08:54:03 +0000
Subject: - Support HTTP_X_FORWARDED_PROTO header for HTTPS detecting
 (#1486866)

git-svn-id: https://svn.roundcube.net/trunk@3828 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 8b8a7d23b..ff535947d 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -1525,9 +1525,11 @@ function rcube_html_editor($mode='')
 function rcube_https_check($port=null, $use_https=true)
 {
   global $RCMAIL;
-  
+
   if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off')
     return true;
+  if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https')
+    return true;
   if ($port && $_SERVER['SERVER_PORT'] == $port)
     return true;
   if ($use_https && isset($RCMAIL) && $RCMAIL->config->get('use_https'))
-- 
cgit v1.2.3