- Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#1486243) + fix port check

git-svn-id: https://svn.roundcube.net/trunk@3063 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 1 insertions, 1 deletions

diff --git a/roundcubemail/index.php b/roundcubemail/index.php
index e0956b4ff..e9b3676e9 100644
--- a/roundcubemail/index.php
+++ b/roundcubemail/index.php
@@ -66,7 +66,7 @@ if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
 // check if https is required (for login) and redirect if necessary
 if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) {
   $https_port = is_bool($force_https) ? 443 : $force_https;
-  if (!(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == $use_https || $RCMAIL->config->get('use_https'))) {
+  if (!rcube_https_check($https_port)) {
     header('Location: https://' . $_SERVER['HTTP_HOST'] . ($https_port != 443 ? ':' . $https_port : '') . $_SERVER['REQUEST_URI']);
     exit;
   }