summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-06 18:18:54 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-06 18:18:54 +0100
commit26dfc41335ef47fe765643148ae980be388084ec (patch)
tree9b21d85d95cde367e4cf66892eff5e3ce0dd7773
parenta03f23351588f04276469cd7742b7ec655bb604b (diff)
downloadvim-git-26dfc41335ef47fe765643148ae980be388084ec.tar.gz
patch 7.4.1268v7.4.1268
Problem: Waittime is used as seconds instead of milliseconds. (Hirohito Higashi) Solution: Divide by 1000.
-rw-r--r--src/channel.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/channel.c b/src/channel.c
index 35875ca9a..d62179860 100644
--- 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 47f45deef..d5552e05f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1268,
+/**/
1267,
/**/
1266,