diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 18 |
2 files changed, 3 insertions, 16 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Removed problematic browser-caching of messages - Fix incompatybility with suhosin.executor.disable_emodifier (#1486321) - Use PLAIN auth when CRAM fails and imap_auth_type='check' (#1486371) - Fix removal of <title> tag from HTML messages (#1486432) diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index c7431d6ed..3998e6211 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -40,27 +40,13 @@ if ($_GET['_uid']) { } } + send_nocacheing_headers(); + $mbox_name = $IMAP->get_mailbox_name(); // show images? rcmail_check_safe($MESSAGE); - // calculate Etag for this request - $etag = md5($MESSAGE->uid.$mbox_name.session_id() - .intval($MESSAGE->headers->mdn_sent) - .intval($MESSAGE->is_safe) - .(!empty($MESSAGE->attachments) ? intval($CONFIG['inline_images']) : '') - .intval($PRINT_MODE) - .$_SESSION['sort_col'].$_SESSION['sort_order'] - .$IMAP->messagecount($mbox_name, 'ALL', true) - ); - - // allow caching, unless remote images are present - if ((bool)$MESSAGE->is_safe) - send_nocacheing_headers(); - else if (empty($CONFIG['devel_mode'])) - send_modified_header($_SESSION['login_time'], $etag, !$MESSAGE->headers->seen); - // set message charset as default if (!empty($MESSAGE->headers->charset)) $IMAP->set_charset($MESSAGE->headers->charset); |