Browse files

- Fix wrong headers for IE on servers without $_SERVER['HTTPS'] (#148…

…5926)

- Force IE style headers for attachments in non-HTTPS session, 'use_https' option (#1485655)
  • Loading branch information...
1 parent 7df0e35 commit 161c28dffcab78da00b6b80693ef9423c4258248 @alecpl alecpl committed Sep 5, 2009
Showing with 7 additions and 4 deletions.
  1. +2 −0 CHANGELOG
  2. +2 −1 index.php
  3. +1 −1 program/include/rcube_shared.inc
  4. +1 −1 program/lib/imap.inc
  5. +1 −1 program/steps/mail/rss.inc
View
2 CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG RoundCube Webmail
===========================
+- 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)
- Fix rcube_mdb2::affected_rows() (#1486082)
View
3 index.php
@@ -64,7 +64,8 @@
}
// 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;
}
View
2 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: ');
}
View
2 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);
View
2 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')

0 comments on commit 161c28d

Please sign in to comment.