Skip to content

Commit b40c1de

Browse files
committed
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)
1 parent 9c51798 commit b40c1de

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/channel.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -979,11 +979,13 @@ channel_open(
979979

980980
ch_log(channel, "Trying to connect to %s port %d", dst, port);
981981

982-
// On Mac and Solaris a zero timeout almost never works. At least wait
983-
// one millisecond. Let's do it for all systems, because we don't know
984-
// why this is needed.
982+
// On Mac and Solaris a zero timeout almost never works. Waiting for
983+
// one millisecond already helps a lot. Later Mac systems (using IPv6)
984+
// need more time, 15 milliseconds appears to work well.
985+
// Let's do it for all systems, because we don't know why this is
986+
// needed.
985987
if (waittime == 0)
986-
waittime = 1;
988+
waittime = 15;
987989

988990
sd = channel_connect(channel, addr->ai_addr, (int)addr->ai_addrlen,
989991
&waittime);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1269,
698700
/**/
699701
1268,
700702
/**/

0 commit comments

Comments
 (0)