- 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)
release-0.6
alecpl 15 years ago
parent 7df0e35210
commit 161c28dffc

@ -1,6 +1,8 @@
CHANGELOG RoundCube Webmail 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) - Check 'post_max_size' for upload max filesize (#1486089)
- Password Plugin: Fix %d inserts username instead of domain (#1486088) - Password Plugin: Fix %d inserts username instead of domain (#1486088)
- Fix rcube_mdb2::affected_rows() (#1486082) - Fix rcube_mdb2::affected_rows() (#1486082)

@ -64,7 +64,8 @@ if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
} }
// check if https is required (for login) and redirect if necessary // 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']); header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
exit; exit;
} }

@ -41,7 +41,7 @@ function send_nocacheing_headers()
header("Pragma: no-cache"); header("Pragma: no-cache");
// We need to set the following headers to make downloads work using IE in HTTPS mode. // 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('Pragma: ');
header('Cache-Control: '); header('Cache-Control: ');
} }

@ -620,7 +620,7 @@ function iil_Connect($host, $user, $password, $options=null) {
} }
stream_set_timeout($conn->fp, 10); 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) if ($my_prefs['debug_mode'] && $line)
write_log('imap', 'S: '. $line); write_log('imap', 'S: '. $line);

@ -30,7 +30,7 @@ $REMOTE_REQUEST = TRUE;
$OUTPUT_TYPE = 'rss'; $OUTPUT_TYPE = 'rss';
$webmail_url = 'http'; $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 .= 's';
$webmail_url .= '://'.$_SERVER['SERVER_NAME']; $webmail_url .= '://'.$_SERVER['SERVER_NAME'];
if ($_SERVER['SERVER_PORT'] != '80') if ($_SERVER['SERVER_PORT'] != '80')

Loading…
Cancel
Save