From b92abad0c58de36d0b0afdcd4ec05261fa1fa84c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 8 Feb 2016 22:37:24 +0100 Subject: [PATCH] patch 7.4.1291 Problem: On MS-Windows the channel test server doesn't quit. Solution: Use return instead of break. (Ken Takata) --- src/testdir/test_channel.py | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py index 40a2043cc..039a9de91 100644 --- a/src/testdir/test_channel.py +++ b/src/testdir/test_channel.py @@ -133,7 +133,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): elif decoded[1] == '!quit!': # we're done self.server.shutdown() - break + return elif decoded[1] == '!crash!': # Crash! 42 / 0 diff --git a/src/version.c b/src/version.c index 66739aa29..9b9702aa2 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 */ +/**/ + 1291, /**/ 1290, /**/ -- 2.50.1