patch 7.4.1291

Problem:    On MS-Windows the channel test server doesn't quit.
Solution:   Use return instead of break. (Ken Takata)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 40a2043cc028c19e74a19b04d5dae239af7f0df9..039a9de91ec15a6f50c969cea7ddfd13f3f1b747 100644 (file)
--- 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 66739aa29d284402ab598858536fd94a09f7f260..9b9702aa27719b6f40c5ec666ee00f9d4fbf3b13 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 */
+/**/
+    1291,
 /**/
     1290,
 /**/