summaryrefslogtreecommitdiff
path: root/index.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-09-05 12:31:19 +0000
committeralecpl <alec@alec.pl>2009-09-05 12:31:19 +0000
commit161c28dffcab78da00b6b80693ef9423c4258248 (patch)
tree9cd2da22daa5e00b029779334fa04d865b4f5ae4 /index.php
parent7df0e352101c36d06e6831123be678a8a6b5077d (diff)
- Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#1485926)
- Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)
Diffstat (limited to 'index.php')
-rw-r--r--index.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/index.php b/index.php
index 542a72451..fc5926dcc 100644
--- a/index.php
+++ b/index.php
@@ -64,7 +64,8 @@ if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
}
// check if https is required (for login) and redirect if necessary
-if ($RCMAIL->config->get('force_https', false) && empty($_SESSION['user_id']) && !(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443)) {
+if ($RCMAIL->config->get('force_https', false) && empty($_SESSION['user_id'])
+ && !(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443 || $RCMAIL->config->get('use_https'))) {
header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
exit;
}