patch 7.4.1361

Problem:    Channel test fails on Solaris.
Solution:   Use the 1 msec waittime for all systems.

diff --git a/src/channel.c b/src/channel.c
index 967e2da0b9bd5f7a3484e017b1dbe2b3ccfad0c1..0106dfb8c1b7bdc799e8a56634ce75ba4bba0891 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -538,12 +538,11 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
     }
     memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
 
-#if defined(__APPLE__) && __APPLE__ == 1
-    /* On Mac a zero timeout almost never works.  At least wait one
-     * millisecond. */
+    /* 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. */
     if (waittime == 0)
        waittime = 1;
-#endif
 
     /*
      * For Unix we need to call connect() again after connect() failed.

diff --git a/src/version.c b/src/version.c
index 916c52c2f9f9995797bae4d2c89cf575e3055ced..b887dacfb1eacc5f840e3f0e54b29f77f7e6218e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1361,
 /**/
     1360,
 /**/