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/program | |
| 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/program')
| -rw-r--r-- | roundcubemail/program/include/rcube_shared.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/rss.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc index 91db38020..85a6105b0 100644 --- a/roundcubemail/program/include/rcube_shared.inc +++ b/roundcubemail/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/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index e6b3ce171..02c9bd9b5 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/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/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') |