Changeset 3208 in subversion

Timestamp:

Jan 17, 2010 7:30:41 AM (3 years ago)

Author:

alec

Message:

• Fix 'force_https' to specified port when URL contains a port number (#1486411)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• index.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

trunk/roundcubemail/index.php

@@ -68 +68 @@
   $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;
   }