Permalink
Browse files

- Fix 'force_https' to specified port when URL contains a port number…

… (#1486411)
  • Loading branch information...
1 parent 8490014 commit 76c94b6ba8a8e306f89f1ee908cb411374e4f2d8 @alecpl alecpl committed Jan 17, 2010
Showing with 4 additions and 1 deletion.
  1. +1 −0 CHANGELOG
  2. +3 −1 index.php
View
@@ -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)
View
@@ -67,7 +67,9 @@
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;
}
}

0 comments on commit 76c94b6

Please sign in to comment.