Skip to content

Commit 254e00d

Browse files
committed
patch 7.4.1361
Problem: Channel test fails on Solaris. Solution: Use the 1 msec waittime for all systems.
1 parent 0ba75a9 commit 254e00d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/channel.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,11 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
538538
}
539539
memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
540540

541-
#if defined(__APPLE__) && __APPLE__ == 1
542-
/* On Mac a zero timeout almost never works. At least wait one
543-
* millisecond. */
541+
/* On Mac and Solaris a zero timeout almost never works. At least wait
542+
* one millisecond. Let's do it for all systems, because we don't know why
543+
* this is needed. */
544544
if (waittime == 0)
545545
waittime = 1;
546-
#endif
547546

548547
/*
549548
* For Unix we need to call connect() again after connect() failed.

src/version.c

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

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1361,
750752
/**/
751753
1360,
752754
/**/

0 commit comments

Comments
 (0)