patch 7.4.1370

Problem:    The Python test script may keep on running.
Solution:   Join the threads. (Yasuhiro Matsumoto)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index ec231e8c891c0b14d5e64ce1e6fb2d88a4d9c4e3..66fd48f43addd1e0371bd841ce848793e9a00654 100644 (file)
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -192,3 +192,8 @@ if __name__ == "__main__":
 
     # Main thread terminates, but the server continues running
     # until server.shutdown() is called.
+    try:
+        while server_thread.isAlive(): 
+            server_thread.join(1)
+    except (KeyboardInterrupt, SystemExit):
+        server.shutdown()

diff --git a/src/version.c b/src/version.c
index d857ed2d51c5482010b8c27acf92641f299f9e61..598d430bcdd10afebce909b3fc29cfc4b34f4119 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 */
+/**/
+    1370,
 /**/
     1369,
 /**/