From 76c94b6ba8a8e306f89f1ee908cb411374e4f2d8 Mon Sep 17 00:00:00 2001 From: alecpl Date: Sun, 17 Jan 2010 12:30:41 +0000 Subject: - Fix 'force_https' to specified port when URL contains a port number (#1486411) --- index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'index.php') diff --git a/index.php b/index.php index e9b3676e9..a7dd0fe53 100644 --- a/index.php +++ b/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; } } -- cgit v1.2.3