diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-05 12:31:19 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-05 12:31:19 +0000 |
| commit | b94572e293cd4e604bf90af1e62a618ec42b39a8 (patch) | |
| tree | 20a16b8da648267404454490793bff3f8ae68f70 /roundcubemail/index.php | |
| parent | 40bfe1f97897e11545b6446bc3fe96f8d38c4344 (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)
git-svn-id: https://svn.roundcube.net/trunk@2927 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/index.php')
| -rw-r--r-- | roundcubemail/index.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index 542a72451..fc5926dcc 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/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; } |