preferred_family = none

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 94b230c0b298d8315c538e4b403b6039368e67be..7da9595efefb9ebcd12ab195be95a48f06caa0ab 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-17  Steven Schubiger  <stsc@members.fsf.org>
+
+       * wget.texi (Download Options): Change documentation to reflect
+       the new default value for --prefer-family.
+       (Wgetrc Commands): Same, for prefer_family wgetrc command.
+

 2008-05-12  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Download Options): -N with -O downgraded to a
 2008-05-12  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Download Options): -N with -O downgraded to a

diff --git a/doc/wget.texi b/doc/wget.texi
index 4f7d2ddf91c3682b5f1161abe74be7c0397235c4..3e661a6f38f33fb420fe574656dbd4ee388c7b0a 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -950,10 +950,10 @@ or to deal with broken network configuration.  Only one of
 same time.  Neither option is available in Wget compiled without IPv6
 support.
 
 same time.  Neither option is available in Wget compiled without IPv6
 support.
 

-@item --prefer-family=IPv4/IPv6/none
+@item --prefer-family=none/IPv4/IPv6

 When given a choice of several addresses, connect to the addresses
 When given a choice of several addresses, connect to the addresses

-with specified address family first.  IPv4 addresses are preferred by
-default.
+with specified address family first.  The address order returned by
+DNS is used without change by default.

 
 This avoids spurious errors and connect attempts when accessing hosts
 that resolve to both IPv6 and IPv4 addresses from IPv4 networks.  For
 
 This avoids spurious errors and connect attempts when accessing hosts
 that resolve to both IPv6 and IPv4 addresses from IPv4 networks.  For


@@ -2849,11 +2849,11 @@ Use POST as the method for all HTTP requests and send the contents of
 @var{file} in the request body.  The same as
 @samp{--post-file=@var{file}}.
 
 @var{file} in the request body.  The same as
 @samp{--post-file=@var{file}}.
 

-@item prefer_family = IPv4/IPv6/none
+@item prefer_family = none/IPv4/IPv6

 When given a choice of several addresses, connect to the addresses
 When given a choice of several addresses, connect to the addresses

-with specified address family first.  IPv4 addresses are preferred by
-default.  The same as @samp{--prefer-family}, which see for a detailed
-discussion of why this is useful.
+with specified address family first.  The address order returned by
+DNS is used without change by default.  The same as @samp{--prefer-family},
+which see for a detailed discussion of why this is useful.

 
 @item private_key = @var{file}
 Set the private key file to @var{file}.  The same as
 
 @item private_key = @var{file}
 Set the private key file to @var{file}.  The same as

diff --git a/src/ChangeLog b/src/ChangeLog
index ad8a67ec6b03615a3f439dcb256bc52ca06c3645..dbc42bd33b2bbe67ce55d0b46bcab282851b6a98 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-05-17  Micah Cowan  <micah@cowan.name>
 
 2008-05-17  Micah Cowan  <micah@cowan.name>
 

+       * init.c (defaults): Set the preferred IP family to `none' by
+       default.

        * main.c (main): Handle Ctrl-D on command-line.
 
 2008-05-15  Steven Schubiger  <schubiger@gmail.com>
        * main.c (main): Handle Ctrl-D on command-line.
 
 2008-05-15  Steven Schubiger  <schubiger@gmail.com>

diff --git a/src/init.c b/src/init.c
index e811d303c890ff71c439ad30a1e4794bf4a5e19c..533bb683ee13737f0d4f9b3dac821fdec7ed7e13 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -301,6 +301,7 @@ defaults (void)
   tmp = getenv ("no_proxy");
   if (tmp)
     opt.no_proxy = sepstring (tmp);
   tmp = getenv ("no_proxy");
   if (tmp)
     opt.no_proxy = sepstring (tmp);

+  opt.prefer_family = prefer_none;

   opt.allow_cache = true;
 
   opt.read_timeout = 900;
   opt.allow_cache = true;
 
   opt.read_timeout = 900;