- 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

1 files changed, 1 insertions, 1 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: ');
   }