RFC2061 changes.

svn path=/trunk/; revision=882

diff --git a/fetchmail.man b/fetchmail.man
index fae705aad4e49c732ef93e072733410b687aefdd..13e94071e6500b1a36fd9898e49d6444f7c8f934 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -1077,8 +1077,7 @@ IMAP2/IMAP2BIS:
 RFC 1176, RFC 1732
 .TP 5
 IMAP4:
-RFC 1730, RFC 1731, RFC 1732, RFC 2060
+RFC 1730, RFC 1731, RFC 1732, RFC 2060, RFC 2061
 .TP 5
 ETRN:
 RFC 1985
-

diff --git a/imap.c b/imap.c
index f6a68ea9baabfbdf6d346f1572d1ea3a40a9fe9b..d1ebe1565e48382cf0d2a71744f6bfc2a68785c0 100644 (file)
--- a/imap.c
+++ b/imap.c
@@ -259,9 +259,12 @@ static int imap_delete(FILE *sockfp, struct query *ctl, int number)
     /* expunges change the fetch numbers */
     number -= deletecount;
 
-    /* use SILENT if possible as a minor throughput optimization */
+    /*
+     * Use SILENT if possible as a minor throughput optimization.
+     * Note: this has been dropped from IMAP4rev1.
+     */
     if ((ok = gen_transact(sockfp,
-                       imap_version >= IMAP4 
+                       imap_version == IMAP4 
                                ? "STORE %d +FLAGS.SILENT (\\Deleted)"
                                : "STORE %d +FLAGS (\\Deleted)", 
                        number)))