summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2011-11-11 10:34:55 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2011-11-11 10:34:55 (GMT)
commit3ad283728dbcb52ba80de264ac53c6f9bac43b87 (patch)
tree10d73e146332a3d143292f69271bd014cba4889f
parentf9b9ca68f809e9a60a4f1c27c8ea43ef0167c26b (diff)
downloadtcl-3ad283728dbcb52ba80de264ac53c6f9bac43b87.zip
tcl-3ad283728dbcb52ba80de264ac53c6f9bac43b87.tar.gz
tcl-3ad283728dbcb52ba80de264ac53c6f9bac43b87.tar.bz2
Use nonblocking writes in single-threaded IO tests to avoid deadlocks when going beyond OS buffers [Bug 3428756].
-rw-r--r--ChangeLog5
-rw-r--r--tests/zlib.test2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 82e2fe0..c82dfcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-11 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
+
+ * tests/zlib.test: Use nonblocking writes in single-threaded IO
+ tests to avoid deadlocks when going beyond OS buffers [Bug 3428756].
+
2011-11-03 Donal K. Fellows <dkf@users.sf.net>
* unix/tclUnixCompat.c (TclpGetPwNam, TclpGetPwUid, TclpGetGrNam)
diff --git a/tests/zlib.test b/tests/zlib.test
index dac11e4..23f0229 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -197,7 +197,7 @@ test zlib-9.2 "socket fcopy with push" -constraints zlib -setup {
test zlib-9.3 "socket fcopy bg (identity)" -constraints {tempNotWin zlib} -setup {
set srv [socket -myaddr localhost -server {apply {{c a p} {
#puts "connection from $a:$p on $c"
- chan configure $c -encoding binary -translation binary
+ chan configure $c -encoding binary -translation binary -blocking 0
puts -nonewline $c [string repeat a 81920]
close $c
}}} 0]