Remove the fetchall kluge.

svn path=/trunk/; revision=1810

1 files changed, 5 insertions, 15 deletions

diff --git a/pop3.c b/pop3.c
index 7dce9264..5fcdc6ab 100644
--- a/pop3.c
+++ b/pop3.c
@@ -530,27 +530,17 @@ static int pop3_fetch(int sock, struct query *ctl, int number, int *lenp)
      * craps out during the message, it will still be marked `unseen' on
      * the server.
      *
+     * However...*don't* do this if we're using keep to suppress deletion!
+     * In that case, marking the seen flag is the only way to prevent the
+     * message from being re-fetched on subsequent runs.
+     *
      * The line count passed is the maximum value of a twos-complement
      * signed integer minus 1 (we take advantage of the fact that, according
      * to all the POP RFCs, "if the number of lines requested by the
      * POP3 client is greater than than the number of lines in the
      * body, then the POP3 server sends the entire message.").
-     *
-     * However...*don't* do this if we're using keep to suppress deletion!
-     * In that case, marking the seen flag is the only way to prevent the
-     * message from being re-fetched on subsequent runs.
-     *
-     * Also suppress TOP if fetchall is on.  This is a kludge to get
-     * around a really obnoxious bug in qpopper 2.41 beta 1 that must
-     * have been introduced sometime after the 2.2 I tested with (Erwan
-     * Mas claims it was in 2.3).  The newer version doesn't bounds-check TOP
-     * requests to clip them at the next end of message.  Grrrrr...
-     *
-     * (Erwan MAS <mas@nic.fr> thinks this was actually due to the TOP
-     * argument overflowing and recommended I decrement it.  Hmmm...
-     * maybe we can take out the fetchall kluge?)
      */
-    if (ctl->keep || ctl->fetchall)
+    if (ctl->keep)
 	gen_send(sock, "RETR %d", number);
     else
 	gen_send(sock, "TOP %d 2147483646", number);