Added SpryNet support.

svn path=/trunk/; revision=2421

4 files changed, 26 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index ef74cd70..08adc37e 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ fetchmail-5.0.0 ():
 * Danish summary and description for specgen.sh.
 * Henrik Storner's fix for the PGP/mimedecode problem.
 * Fix netrc search code to be able to search >1 host entry per file.
+* Added heads-up about SpryNet in the FAQ and a test in the autoprobe code.
 
 There are 267 people on fetchmail-friends and 365 on fetchmail-announce.
 
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index dd5d1c89..debdf346 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1999/03/27 16:07:00 $
+<td width="30%" align=right>$Date: 1999/04/01 03:16:15 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -77,6 +77,7 @@ IP address?</a><br>
 <a href="#S6">S6. How can I use fetchmail with geocities POP3 servers?</a><br>
 <a href="#S7">S7. How can I use fetchmail with Hotmail?</a><br>
 <a href="#S8">S8. How can I use fetchmail with MSN?</a><br>
+<a href="#S9">S9. How can I use fetchmail with SpryNet?</a><br>
 
 <h1>How to set up well-known security and authentication methods:</h1>
 
@@ -1328,6 +1329,14 @@ This is a customer lock-in tactic; we recommend boycotting MSN as the
 only appropriate response.<p>
 
 <hr>
+<h2><a name="S9">S9. How can I use fetchmail with SpryNet?</a></h2>
+
+The SpryNet POP3 servers mark a message queried with TOP as seen.
+This means that if your connection drops in mid-message, it may end
+up invisibly stuck on your mail spool.  Use the <code>fetchall</code> 
+flag to ensure that it's recovered on the next cycle.<p>
+
+<hr>
 <h2><a name="K1">K1. How can I use fetchmail with SOCKS?</a></h2>
 
 Daniel Sobral &lt<a href="mailto:dcs@gns.com.br">dcs@gns.com.br</a>
@@ -2293,7 +2302,7 @@ Re-ordering messages is a user-agent function, anyway.<P>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1999/03/27 16:07:00 $
+<td width="30%" align=right>$Date: 1999/04/01 03:16:15 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmailconf b/fetchmailconf
index 52682593..c004433d 100755
--- a/fetchmailconf
+++ b/fetchmailconf
@@ -1113,6 +1113,14 @@ Therefore, it is strongly recommended that you turn on `fetchall' on all
 user entries associated with this server.  
 
 """
+            if string.find(greetline, "sprynet.com") > 0:
+                warnings = warnings + """
+You appear to be using a SpryNet server.  In mid-1999 it was reported that
+the SpryNet TOP command marks messages seen.  Therefore, for proper error
+recovery in the event of a line drop, it is strongly recommended that you
+turn on `fetchall' on all user entries associated with this server.  
+
+"""
 
 # Steve VanDevender <stevev@efn.org> writes:
 # The only system I have seen this happen with is cucipop-1.31
diff --git a/pop3.c b/pop3.c
index f0f8fadb..6a33c2f2 100644
--- a/pop3.c
+++ b/pop3.c
@@ -575,14 +575,15 @@ static int pop3_fetch(int sock, struct query *ctl, int number, int *lenp)
 #endif /* SDPS_ENABLE */
 
     /*
-     * Though the POP RFCs don't document this fact, on every POP3 server
-     * I know of messages are marked "seen" only at the time the OK
-     * response to a RETR is issued.
+     * Though the POP RFCs don't document this fact, on almost every
+     * POP3 server I know of messages are marked "seen" only at the
+     * time the OK response to a RETR is issued.
      *
      * This means we can use TOP to fetch the message without setting its
      * seen flag.  This is good!  It means that if the protocol exchange
      * craps out during the message, it will still be marked `unseen' on
-     * the server.
+     * the server.  (Exception: in early 1999 SpryNet's POP3 servers were
+     * reported to mark messages seen on a TOP fetch.)
      *
      * 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
@@ -601,8 +602,7 @@ static int pop3_fetch(int sock, struct query *ctl, int number, int *lenp)
      *
      * The line count passed (99999999) is the maximum value CompuServe will
      * accept; it's much lower than the natural value 2147483646 (the maximum
-     * twos-complement signed 32-bit integer minus 1)
-     */
+     * twos-complement signed 32-bit integer minus 1) */
     if (ctl->keep || ctl->fetchall)
 	gen_send(sock, "RETR %d", number);
     else