dovecot-2.0: imap: Removed netscape-eoh (Netscape 4.x) from imap...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/22699553569f
changeset: 11442:22699553569f
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jun 01 16:57:55 2010 +0100
description:
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.

diffstat:

 doc/example-config/conf.d/20-imap.conf |  6 ------
 src/imap/imap-fetch-body.c             |  8 --------
 src/imap/imap-settings.c               |  1 -
 src/imap/imap-settings.h               |  1 -
 4 files changed, 0 insertions(+), 16 deletions(-)

diffs (56 lines):

diff -r 3ef582c3fb72 -r 22699553569f doc/example-config/conf.d/20-imap.conf
--- a/doc/example-config/conf.d/20-imap.conf	Tue Jun 01 16:37:59 2010 +0100
+++ b/doc/example-config/conf.d/20-imap.conf	Tue Jun 01 16:57:55 2010 +0100
@@ -43,12 +43,6 @@
   #     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 -r 3ef582c3fb72 -r 22699553569f src/imap/imap-fetch-body.c
--- a/src/imap/imap-fetch-body.c	Tue Jun 01 16:37:59 2010 +0100
+++ b/src/imap/imap-fetch-body.c	Tue Jun 01 16:57:55 2010 +0100
@@ -435,14 +435,6 @@
 	}
 	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 -r 3ef582c3fb72 -r 22699553569f src/imap/imap-settings.c
--- a/src/imap/imap-settings.c	Tue Jun 01 16:37:59 2010 +0100
+++ b/src/imap/imap-settings.c	Tue Jun 01 16:57:55 2010 +0100
@@ -117,7 +117,6 @@
 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 -r 3ef582c3fb72 -r 22699553569f src/imap/imap-settings.h
--- a/src/imap/imap-settings.h	Tue Jun 01 16:37:59 2010 +0100
+++ b/src/imap/imap-settings.h	Tue Jun 01 16:57:55 2010 +0100
@@ -6,7 +6,6 @@
 /* <settings checks> */
 enum imap_client_workarounds {
 	WORKAROUND_DELAY_NEWMAIL		= 0x01,
-	WORKAROUND_NETSCAPE_EOH			= 0x04,
 	WORKAROUND_TB_EXTRA_MAILBOX_SEP		= 0x08
 };
 /* </settings checks> */