summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_shared.inc2
-rw-r--r--program/lib/imap.inc2
-rw-r--r--program/steps/mail/rss.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 91db38020..85a6105b0 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -41,7 +41,7 @@ function send_nocacheing_headers()
header("Pragma: no-cache");
// We need to set the following headers to make downloads work using IE in HTTPS mode.
- if (isset($_SERVER['HTTPS'])) {
+ if (isset($_SERVER['HTTPS']) || rcmail::get_instance()->config->get('use_https')) {
header('Pragma: ');
header('Cache-Control: ');
}
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index e6b3ce171..02c9bd9b5 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -620,7 +620,7 @@ function iil_Connect($host, $user, $password, $options=null) {
}
stream_set_timeout($conn->fp, 10);
- $line = stream_get_line($conn->fp, 8192, "\r\n");
+ $line = stream_get_line($conn->fp, 8192, "\n");
if ($my_prefs['debug_mode'] && $line)
write_log('imap', 'S: '. $line);
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')