From: Micah Cowan <micah@cowan.name>
Date: Sat, 17 May 2008 20:23:47 +0000 (-0700)
Subject: Apply Kenneth Parnell's patch for prefer_family, in addition to Steven Schubiger... 
X-Git-Tag: v1.13~421^2~12^2~18
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=7c46e0f2c1ccc6802765bfb45e192d8f16a0d1e5

Apply Kenneth Parnell's patch for prefer_family, in addition to Steven Schubiger's; fix attribution for Schubiger's patch.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index dbc42bd3..7c1869b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,11 @@
-2008-05-17  Micah Cowan  <micah@cowan.name>
+2008-05-17  Steven Schubiger  <schubiger@gmail.com>
 
 	* init.c (defaults): Set the preferred IP family to `none' by
 	default.
+
+2008-05-17  Kenny Parnell  <k.parnell@gmail.com>
+	(cmd_spec_prefer_family): Initialize prefer_family to prefer_none.
+
 	* 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 533bb683..97976553 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1156,7 +1156,7 @@ cmd_spec_prefer_family (const char *com, const char *val, void *place_ignored)
     { "IPv6", prefer_ipv6 },
     { "none", prefer_none },
   };
-  int prefer_family = prefer_ipv4;
+  int prefer_family = prefer_none;
   int ok = decode_string (val, choices, countof (choices), &prefer_family);
   if (!ok)
     fprintf (stderr, _("%s: %s: Invalid value %s.\n"), exec_name, com, quote (val));