summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_channel.py3
-rw-r--r--src/testdir/test_netbeans.vim2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 6b2947d904..8dba3ba4ca 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -21,6 +21,9 @@ except ImportError:
class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
+ def setup(self):
+ self.request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+
def handle(self):
print("=== socket opened ===")
while True:
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 7f1dab46dd..781f179c38 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -609,7 +609,7 @@ func Nb_basic(port)
" detach
call appendbufline(cmdbufnr, '$', 'detach_Test')
- call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 6)')
+ call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 8)')
call WaitForAssert({-> assert_equal('0:disconnect=91', readfile("Xnetbeans")[-1])})
" the connection was closed
diff --git a/src/version.c b/src/version.c
index 232fbb09c0..d04f529d9b 100644
--- 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 */
/**/
+ 786,
+/**/
785,
/**/
784,