Lower fastuidl default to 4 (was 10). Patch by Sunil Shetye.

svn path=/branches/BRANCH_6-3/; revision=4740

diff --git a/NEWS b/NEWS
index d0f1d00745d4c2d9edf012cbf5b381b1b6086367..3dcd16dffe6db5e5680c086f9f1ef83985197441 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -49,16 +49,18 @@ fetchmail 6.3.3 (not yet released):
   and Brendan Lynch, fix by Sunil Shetye (his patch was merged) and Brendan
   Lynch.
 * ./configure --quiet is now quieter (no SSL and fallback-related output).
-* fix bug in LMTP port validation (patch by Miloslav Trmac).
+* LMTP: fix bug in LMTP port validation (patch by Miloslav Trmac).
 * Miloslav Trmac's patch (with minor changes) to fix char * sign consistency,
   unused arguments and variables.
-* Warn and disable SDPS if POP3 is disabled to avoid compilation errors.
+* SDPS: Warn and disable SDPS if POP3 is disabled to avoid compilation errors.
 * More signedness, unused argument/variable and other warning fixes.
-* Stop sending EXPUNGE after NOOP-idling (patch by Sunil Shetye).
+* IMAP: Stop sending EXPUNGE after NOOP-idling (patch by Sunil Shetye).
 
 # CHANGES:
 * --idle can now be specified on the command line, too.
 * --fetchall is now supported on the command-line.
+* POP3: Lower default fastuidl span to 4 (i. e. every 4th run fetches the
+  whole UIDL list), patch by Sunil Shetye.
 
 # DOCUMENTATION:
 * "ssl" is a user option rather than a server option. Patch by Nico Golde.

diff --git a/fetchmail.c b/fetchmail.c
index 6325d8f9a50aa6859fe8f9d6afa656ce47aa25bd..7712820b0c073705464bdf4cd7a91a15abe33fa2 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -970,7 +970,7 @@ static int load_params(int argc, char **argv, int optind)
     def_opts.remotename = user;
     def_opts.listener = SMTP_MODE;
     def_opts.fetchsizelimit = 100;
-    def_opts.fastuidl = 10;
+    def_opts.fastuidl = 4;
 
     /* get the location of rcfile */
     rcfiledir[0] = 0;

diff --git a/fetchmail.man b/fetchmail.man
index 3dd0d9f254fff6a6e6ceda4f4ff5df8f725ade76..f1d521e844f8f022b2a4a19d58d83a2deb2f6f01 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -615,7 +615,7 @@ a linear search should be done. In daemon mode, linear search is used
 once followed by binary searches in 'n-1' polls if 'n' is greater than
 1; binary search is always used if 'n' is 1; linear search is always
 used if 'n' is 0. In non-daemon mode, binary search is used if 'n' is
-1; otherwise linear search is used.
+1; otherwise linear search is used. The default value of 'n' is 4.
 This option works with POP3 only.
 .TP
 .B \-e <count> | \-\-expunge <count>

diff --git a/fetchmailconf.py b/fetchmailconf.py
index ff870233fc7b51d11e079bb9ea0e862c6b560137..41c4d398ac3ced4b055799f7208aaba7b15fb5e0 100755 (executable)
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -249,7 +249,7 @@ class User:
        self.warnings = 3600    # Size warning interval (see tunable.h)
        self.fetchlimit = 0     # Max messages fetched per batch
        self.fetchsizelimit = 100       # Max message sizes fetched per transaction
-       self.fastuidl = 10      # Do fast uidl 9 out of 10 times
+       self.fastuidl = 4       # Do fast uidl 3 out of 4 times
        self.batchlimit = 0     # Max message forwarded per batch
        self.expunge = 0        # Interval between expunges (IMAP)
        self.ssl = 0            # Enable Seccure Socket Layer