patch 7.4.1268

Problem:    Waittime is used as seconds instead of milliseconds. (Hirohito
            Higashi)
Solution:   Divide by 1000.

diff --git a/src/channel.c b/src/channel.c
index 35875ca9a7ecae4a0613c0f242991bb7c8a2971f..d6217986089771fcc25daea90acdff5220b0299e 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -440,8 +440,8 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
        FD_ZERO(&wfds);
        FD_SET(sd, &rfds);
        FD_SET(sd, &wfds);
-       tv.tv_sec = waittime;
-       tv.tv_usec = 0;
+       tv.tv_sec = waittime / 1000;
+       tv.tv_usec = (waittime % 1000) * 1000;
        ret = select((int)sd+1, &rfds, &wfds, NULL, &tv);
        if (ret < 0)
        {

diff --git a/src/version.c b/src/version.c
index 47f45deef9153322c41caae728943b2db710681d..d5552e05f123c9a6c8023d2523bece2f31a52661 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1268,
 /**/
     1267,
 /**/