Changeset 161c28d in github

Timestamp:

Sep 5, 2009 8:31:19 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

e077870a

Parents:

7df0e35

Message:

• Fix wrong headers for IE on servers without $_SERVERHTTPS? (#1485926)
• Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)

Files:

• CHANGELOG (modified) (1 diff)
• index.php (modified) (1 diff)
• program/include/rcube_shared.inc (modified) (1 diff)
• program/lib/imap.inc (modified) (1 diff)
• program/steps/mail/rss.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)
 - Check 'post_max_size' for upload max filesize (#1486089) 
 - Password Plugin: Fix %d inserts username instead of domain (#1486088)

index.php

@@ -65 +65 @@
 
 // check if https is required (for login) and redirect if necessary
-if ($RCMAIL->config->get('force_https', false) && empty($_SESSION['user_id']) && !(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443)) {
+if ($RCMAIL->config->get('force_https', false) && empty($_SESSION['user_id'])
+    && !(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443 || $RCMAIL->config->get('use_https'))) {
   header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
   exit;

program/include/rcube_shared.inc

@@ -42 +42 @@
   
   // 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: ');

program/lib/imap.inc

@@ -621 +621 @@
 
         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)

program/steps/mail/rss.inc

@@ -31 +31 @@
 
 $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'];