summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--generic/tclIOSock.c9
2 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e6bf629..7d4e098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
+2011-08-04 Reinhard Max <max@suse.de>
+
+ * generic/tclIOSock.c (TclCreateSocketAddress): Don't bother using
+ AI_ADDRCONFIG for now, as it was causing problems in various
+ situations.
+
+2011-08-02 Don Porter <dgp@users.sourceforge.net>
+======= COMMON ANCESTOR content follows ============================
+2011-08-02 Don Porter <dgp@users.sourceforge.net>
+======= MERGED IN content follows ==================================
2011-08-04 Donal K. Fellows <dkf@users.sf.net>
* generic/tclAssembly.c (AssembleOneLine, GetBooleanOperand)
@@ -9,6 +20,7 @@
tests.
2011-08-02 Don Porter <dgp@users.sourceforge.net>
+>>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
* changes: Updates for 8.6b2 release.
* tools/tcltk-man2html.tcl: Variable substitution botch.
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index aabd67d..768428f 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -178,6 +178,14 @@ TclCreateSocketAddress(
}
hints.ai_socktype = SOCK_STREAM;
+#if 0
+ /*
+ * We found some problems when using AI_ADDRCONFIG, e.g. on systems that
+ * have no networking besides the loopback interface and want to resolve
+ * localhost. See bugs 3385024, 3382419, 3382431. As the advantage of
+ * using AI_ADDRCONFIG in situations where it works, is probably low,
+ * we'll leave it out for now. After all, it is just an optimisation.
+ */
#if defined(AI_ADDRCONFIG) && !defined(_AIX) && !defined(__hpux)
/*
* Missing on: OpenBSD, NetBSD.
@@ -185,6 +193,7 @@ TclCreateSocketAddress(
*/
hints.ai_flags |= AI_ADDRCONFIG;
#endif
+#endif
if (willBind) {
hints.ai_flags |= AI_PASSIVE;
}