diff options
author | Bram Moolenaar <Bram@vim.org> | 2023-01-31 21:01:08 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-01-31 21:01:08 +0000 |
commit | b40c1de38442a26f31efb8473adec7fad560f3d0 (patch) | |
tree | 4a68557b1bf5b70945ce43426266c686b232506f | |
parent | 9c51798a1f3b79ace5ae0551a8bb122025ac94ed (diff) | |
download | vim-git-b40c1de38442a26f31efb8473adec7fad560f3d0.tar.gz |
patch 9.0.1269: channel test often fails on Mac OSv9.0.1269
Problem: Channel test often fails on Mac OS.
Solution: Increase the wait time from one to 15 milliseconds. (D. Ben
Knoble, closes #11894)
-rw-r--r-- | src/channel.c | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/channel.c b/src/channel.c index db4568d49..ee5b5124a 100644 --- 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 45dd798bf..ad663cd65 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1269, +/**/ 1268, /**/ 1267, |