summaryrefslogtreecommitdiff
path: root/program/steps/mail
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 /program/steps/mail
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 'program/steps/mail')
-rw-r--r--program/steps/mail/rss.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/steps/mail/rss.inc b/program/steps/mail/rss.inc
index 667a3487d..2ebd15c9f 100644
--- a/program/steps/mail/rss.inc
+++ b/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')