diff options
| -rw-r--r-- | src/testdir/test_netbeans.py | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py index 3471dd9526..e0d291d60d 100644 --- a/src/testdir/test_netbeans.py +++ b/src/testdir/test_netbeans.py @@ -52,7 +52,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): return if len(response) > 0: - self.request.sendall(response) + self.request.sendall(response.encode('utf-8')) # Write the respoinse into the file, so that the test can knows # the command was sent. with open("Xnetbeans", "a") as myfile: diff --git a/src/version.c b/src/version.c index 5634114385..77d35a2dc3 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5, +/**/ 4, /**/ 3, |