summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordkf <dkf@noemail.net>2010-10-19 22:50:37 (GMT)
committerdkf <dkf@noemail.net>2010-10-19 22:50:37 (GMT)
commitf49482857400bc9d06a68c28836a2b6c99bb21a2 (patch)
tree48ff659ae07503aceaa55c3c15cb6feee3d8e4c0 /tests
parent0e88ec15c0c66424b6e1622a192350c9b25b385c (diff)
downloadtcl-f49482857400bc9d06a68c28836a2b6c99bb21a2.zip
tcl-f49482857400bc9d06a68c28836a2b6c99bb21a2.tar.gz
tcl-f49482857400bc9d06a68c28836a2b6c99bb21a2.tar.bz2
* generic/tclZlib.c (Tcl_ZlibStreamGet): [Bug 3081008]: Ensure that
when a bytearray gets its internals entangled with zlib for more than a passing moment, that bytearray will never be shimmered away. This increases the amount of copying but is simple to get right, which is a reasonable trade-off. * generic/tclStringObj.c (Tcl_AppendObjToObj): Added some special cases so that most of the time when you build up a bytearray by appending, it actually ends up being a bytearray rather than shimmering back and forth to string. * tests/http11.test (check_crc): Use a simpler way to express the functionality of this procedure. FossilOrigin-Name: 885ee93472cc7073906419cbfe1cc989eac0e39c
Diffstat (limited to 'tests')
-rw-r--r--tests/http11.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/http11.test b/tests/http11.test
index 0cecaa1..230ce5a 100644
--- a/tests/http11.test
+++ b/tests/http11.test
@@ -62,7 +62,7 @@ proc meta {tok {key ""}} {
proc check_crc {tok args} {
set crc [meta $tok x-crc32]
- if {[llength $args]} {set data [lindex $args 0]} else {set data [http::data $tok]}
+ set data [expr {[llength $args] ? [lindex $args 0] : [http::data $tok]}]
set chk [format %x [zlib crc32 $data]]
if {$crc ne $chk} {
return "crc32 mismatch: $crc ne $chk"