diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-01-17 12:30:41 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-01-17 12:30:41 +0000 |
| commit | b23ef8283cd614ce4b36c30c353a7627438953e7 (patch) | |
| tree | f7c125a703830c746e1f986a6ed7ea193ed3f3c9 | |
| parent | a79c6db000d7c009d8bf7564c1b548ce860d31da (diff) | |
- Fix 'force_https' to specified port when URL contains a port number (#1486411)
git-svn-id: https://svn.roundcube.net/trunk@3208 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/index.php | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 7a44f89dd..3983e243d 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix 'force_https' to specified port when URL contains a port number (#1486411) - Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422) - Bug in spellchecker suggestions when server charset != UTF8 (#1486406) - Managesieve: Fix requires generation for multiple actions (#1486397) diff --git a/roundcubemail/index.php b/roundcubemail/index.php index e9b3676e9..a7dd0fe53 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -67,7 +67,9 @@ if ($RCMAIL->action=='error' && !empty($_GET['_code'])) { if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) { $https_port = is_bool($force_https) ? 443 : $force_https; if (!rcube_https_check($https_port)) { - header('Location: https://' . $_SERVER['HTTP_HOST'] . ($https_port != 443 ? ':' . $https_port : '') . $_SERVER['REQUEST_URI']); + $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']); + $host .= ($https_port != 443 ? ':' . $https_port : ''); + header('Location: https://' . $host . $_SERVER['REQUEST_URI']); exit; } } |