patch 9.0.1269: channel test often fails on Mac OS

Problem:    Channel test often fails on Mac OS.
Solution:   Increase the wait time from one to 15 milliseconds. (D. Ben
            Knoble, closes #11894)

diff --git a/src/channel.c b/src/channel.c
index db4568d49e7952783ab92b0977ca951f77ba18fb..ee5b5124a3d1e9971f30cc6d9d62ebfb72ae90d5 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -979,11 +979,13 @@ channel_open(
 
        ch_log(channel, "Trying to connect to %s port %d", dst, port);
 
-       // On Mac and Solaris a zero timeout almost never works.  At least wait
-       // one millisecond.  Let's do it for all systems, because we don't know
-       // why this is needed.
+       // On Mac and Solaris a zero timeout almost never works.  Waiting for
+       // one millisecond already helps a lot.  Later Mac systems (using IPv6)
+       // need more time, 15 milliseconds appears to work well.
+       // Let's do it for all systems, because we don't know why this is
+       // needed.
        if (waittime == 0)
-           waittime = 1;
+           waittime = 15;
 
        sd = channel_connect(channel, addr->ai_addr, (int)addr->ai_addrlen,
                                                                   &waittime);

diff --git a/src/version.c b/src/version.c
index 45dd798bf512feb561248fa92deae08ee1a19e82..ad663cd650843e9a9af1c6aa7df7c324fbd9396f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1269,
 /**/
     1268,
 /**/