summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps/mail
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-09-05 12:31:19 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-09-05 12:31:19 +0000
commitb94572e293cd4e604bf90af1e62a618ec42b39a8 (patch)
tree20a16b8da648267404454490793bff3f8ae68f70 /roundcubemail/program/steps/mail
parent40bfe1f97897e11545b6446bc3fe96f8d38c4344 (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/program/steps/mail')
-rw-r--r--roundcubemail/program/steps/mail/rss.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/rss.inc b/roundcubemail/program/steps/mail/rss.inc
index 667a3487d..2ebd15c9f 100644
--- a/roundcubemail/program/steps/mail/rss.inc
+++ b/roundcubemail/program/steps/mail/rss.inc
@@ -30,7 +30,7 @@ $REMOTE_REQUEST = TRUE;
$OUTPUT_TYPE = 'rss';
$webmail_url = 'http';
-if (strstr('HTTPS', $_SERVER['SERVER_PROTOCOL'] )!== FALSE)
+if (strstr('HTTPS', $_SERVER['SERVER_PROTOCOL'] )!== FALSE || $RCMAIL->config->get('use_https'))
$webmail_url .= 's';
$webmail_url .= '://'.$_SERVER['SERVER_NAME'];
if ($_SERVER['SERVER_PORT'] != '80')