imap: Removed netscape-eoh (Netscape 4.x) from imap client workarounds.

This client should be long dead by now. Also the workaround causes
Dovecot to violate IMAP RFC, so it's not really recommended anyway.

--HG--
branch : HEAD

diff --git a/doc/example-config/conf.d/20-imap.conf b/doc/example-config/conf.d/20-imap.conf
index 097d4e1cde868aed38989e23a22c9e3c05fe808f..b432aa313a692389e097b661cf02d7edb9518f3d 100644 (file)
--- a/doc/example-config/conf.d/20-imap.conf
+++ b/doc/example-config/conf.d/20-imap.conf
@@ -43,12 +43,6 @@ protocol imap {
   #     may show user "Message no longer in server" errors. Note that OE6 still
   #     breaks even with this workaround if synchronization is set to
   #     "Headers Only".
-  #   netscape-eoh:
-  #     Netscape 4.x breaks if message headers don't end with the empty "end of
-  #     headers" line. Normally all messages have this, but setting this
-  #     workaround makes sure that Netscape never breaks by adding the line if
-  #     it doesn't exist. This is done only for FETCH BODY[HEADER.FIELDS..]
-  #     commands. Note that RFC says this shouldn't be done.
   #   tb-extra-mailbox-sep:
   #     With mbox storage a mailbox can contain either mails or submailboxes,
   #     but not both. Thunderbird separates these two by forcing server to

diff --git a/src/imap/imap-fetch-body.c b/src/imap/imap-fetch-body.c
index 6882cfbaa5159b72b1e2713c55bf0c33129e0c06..035df262aea07ba2f8731adc05b6b906f1c2bb85 100644 (file)
--- a/src/imap/imap-fetch-body.c
+++ b/src/imap/imap-fetch-body.c
@@ -435,14 +435,6 @@ static int fetch_header_partial_from(struct imap_fetch_context *ctx,
        }
        i_stream_seek(ctx->cur_input, old_offset);
 
-       if (!ctx->cur_have_eoh &&
-           (ctx->client->set->parsed_workarounds & WORKAROUND_NETSCAPE_EOH) != 0) {
-               /* Netscape 4.x doesn't like if end of headers line is
-                  missing. */
-               msg_size.virtual_size += 2;
-               ctx->cur_append_eoh = TRUE;
-       }
-
        ctx->cur_size_field = 0;
        return fetch_data(ctx, body, &msg_size);
 }

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 02317b6ea4a567e461cf9f9f018aee6e159c7950..bfdc0a492b8e7c1d0510f5621c8da4f3ec2f1cb5 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -117,7 +117,6 @@ struct imap_client_workaround_list {
 static const struct imap_client_workaround_list imap_client_workaround_list[] = {
        { "delay-newmail", WORKAROUND_DELAY_NEWMAIL },
        { "outlook-idle", 0 }, /* only for backwards compatibility */
-       { "netscape-eoh", WORKAROUND_NETSCAPE_EOH },
        { "tb-extra-mailbox-sep", WORKAROUND_TB_EXTRA_MAILBOX_SEP },
        { NULL, 0 }
 };

diff --git a/src/imap/imap-settings.h b/src/imap/imap-settings.h
index e8bdf7e585fa6ed01b39905503799e7e33c88cff..f35e5d0350cd3a7615017c05f96abce5f6c49c47 100644 (file)
--- a/src/imap/imap-settings.h
+++ b/src/imap/imap-settings.h
@@ -6,7 +6,6 @@ struct mail_user_settings;
 /* <settings checks> */
 enum imap_client_workarounds {
        WORKAROUND_DELAY_NEWMAIL                = 0x01,
-       WORKAROUND_NETSCAPE_EOH                 = 0x04,
        WORKAROUND_TB_EXTRA_MAILBOX_SEP         = 0x08
 };
 /* </settings checks> */