Default value for waitretry.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index a879fcb830a29bb96fe9cefe37b7ce195d50c1c3..9c50b60dee7c35a6bf037482281b276251a6613e 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-15  Steven Schubiger  <stsc@members.fsf.org>
+
+       * sample.wgetrc: Comment the waitretry "default" value, 
+       because there is a global one now.
+
+       * wget.texi (Download Options): Mention the global 
+       default value.
+

 2008-11-10  Micah Cowan  <micah@cowan.name>
 
        * Makefile.am (EXTRA_DIST): Removed no-longer-present
 2008-11-10  Micah Cowan  <micah@cowan.name>
 
        * Makefile.am (EXTRA_DIST): Removed no-longer-present

diff --git a/doc/sample.wgetrc b/doc/sample.wgetrc
index c69596bf1c9f1f32bebb25d17561227ddb32b217..08e810fdbd3102686676eb8130940a1e21d8e381 100644 (file)
--- a/doc/sample.wgetrc
+++ b/doc/sample.wgetrc
@@ -49,7 +49,7 @@
 # downloads, set waitretry to maximum number of seconds to wait (Wget
 # will use "linear backoff", waiting 1 second after the first failure
 # on a file, 2 seconds after the second failure, etc. up to this max).
 # downloads, set waitretry to maximum number of seconds to wait (Wget
 # will use "linear backoff", waiting 1 second after the first failure
 # on a file, 2 seconds after the second failure, etc. up to this max).

-waitretry = 10
+#waitretry = 10

 
 
 ##
 
 
 ##

diff --git a/doc/wget.texi b/doc/wget.texi
index 8af74d9490a4ac3649809f6345b18703282aa1dd..6e0dd0a080c330b9c9956a91e589b79bd62b9656 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -822,10 +822,9 @@ use @dfn{linear backoff}, waiting 1 second after the first failure on a
 given file, then waiting 2 seconds after the second failure on that
 file, up to the maximum number of @var{seconds} you specify.  Therefore,
 a value of 10 will actually make Wget wait up to (1 + 2 + ... + 10) = 55
 given file, then waiting 2 seconds after the second failure on that
 file, up to the maximum number of @var{seconds} you specify.  Therefore,
 a value of 10 will actually make Wget wait up to (1 + 2 + ... + 10) = 55

-seconds per file.
+seconds per file. 

 
 

-Note that this option is turned on by default in the global
-@file{wgetrc} file.
+By default, Wget will assume a value of 10 seconds.

 
 @cindex wait, random
 @cindex random wait
 
 @cindex wait, random
 @cindex random wait

diff --git a/src/ChangeLog b/src/ChangeLog
index 68348d1f93708fb3b8550f580a0fd8aa8cfa7b79..407ee757812bfee08e1584c864ae3dba29132db6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-15  Steven Schubiger  <stsc@members.fsf.org>
+
+       * init.c (defaults): Set default waitretry value.
+

 2008-11-14  Steven Schubiger  <stsc@members.fsf.org>
 
        * main.c (format_and_print_line): Use a custom format 
 2008-11-14  Steven Schubiger  <stsc@members.fsf.org>
 
        * main.c (format_and_print_line): Use a custom format 

diff --git a/src/init.c b/src/init.c
index 768bebd13885866f1b6b27c21cf0fac597f27066..06a4d3c8d08658fd2e2b7205ef1bd34a7b3f40f1 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -331,6 +331,8 @@ defaults (void)
   opt.restrict_files_case = restrict_no_case_restriction;
 
   opt.max_redirect = 20;
   opt.restrict_files_case = restrict_no_case_restriction;
 
   opt.max_redirect = 20;

+
+  opt.waitretry = 10;

 }
 \f
 /* Return the user's home directory (strdup-ed), or NULL if none is
 }
 \f
 /* Return the user's home directory (strdup-ed), or NULL if none is