Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge trunk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | bg-tip-282 |
| Files: | files | file ages | folders |
| SHA1: |
5fb0e5ebc8688b165b719ae07c8c703c |
| User & Date: | dgp 2017-02-27 15:19:16 |
Context
|
2018-03-15
| ||
| 13:49 | merge 8.7 Leaf check-in: ad3f046675 user: dgp tags: bg-tip-282 | |
|
2017-03-01
| ||
| 08:49 | reset to bg-tip-282 - in preparation to implementing (9). (2) is dead. check-in: d7f00edf5d user: avl tags: avl-tip-282 | |
|
2017-02-27
| ||
| 15:19 | merge trunk check-in: 5fb0e5ebc8 user: dgp tags: bg-tip-282 | |
| 14:53 | ParseTokens failed to fully respect its numBytes argument. check-in: f37dff89f9 user: dgp tags: trunk | |
|
2017-02-26
| ||
| 13:47 | Reap the simplifications brought by the previous bugfix. check-in: cccdc65650 user: ferrieux tags: bg-tip-282 | |
Changes
Changes to generic/tclZlib.c.
1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 |
}
if (zshPtr->mode == TCL_ZLIB_STREAM_DEFLATE) {
zshPtr->stream.next_in = Tcl_GetByteArrayFromObj(data, &size);
zshPtr->stream.avail_in = size;
/*
* Must not do a zero-length compress. [Bug 25842c161]
*/
if (size == 0) {
return TCL_OK;
}
if (HaveDictToSet(zshPtr)) {
e = SetDeflateDictionary(&zshPtr->stream, zshPtr->compDictObj);
if (e != Z_OK) {
ConvertError(zshPtr->interp, e, zshPtr->stream.adler);
|
| | |
1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 |
}
if (zshPtr->mode == TCL_ZLIB_STREAM_DEFLATE) {
zshPtr->stream.next_in = Tcl_GetByteArrayFromObj(data, &size);
zshPtr->stream.avail_in = size;
/*
* Must not do a zero-length compress unless finalizing. [Bug 25842c161]
*/
if (size == 0 && flush != Z_FINISH) {
return TCL_OK;
}
if (HaveDictToSet(zshPtr)) {
e = SetDeflateDictionary(&zshPtr->stream, zshPtr->compDictObj);
if (e != Z_OK) {
ConvertError(zshPtr->interp, e, zshPtr->stream.adler);
|
Changes to tests/zlib.test.
153 154 155 156 157 158 159 160 161 162 163 164 165 166 |
$strm put -finalize $randdata
set data [$strm get]
list [string length $data] [string length [zlib decompress $data]]
} -cleanup {
catch {$strm close}
unset -nocomplain randdata data
} -result {120185 18003000}
test zlib-8.1 {zlib transformation} -constraints zlib -setup {
set file [makeFile {} test.gz]
} -body {
set f [zlib push gzip [open $file w] -header {comment gorp}]
puts $f "ok"
close $f
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 |
$strm put -finalize $randdata
set data [$strm get]
list [string length $data] [string length [zlib decompress $data]]
} -cleanup {
catch {$strm close}
unset -nocomplain randdata data
} -result {120185 18003000}
test zlib-7.9 {zlib stream finalize (bug 25842c161)} -constraints zlib -setup {
set z1 [zlib stream gzip]
set z2 [zlib stream gzip]
} -body {
$z1 put ABCDEedbca..
$z1 finalize
zlib gunzip [$z1 get]
} -cleanup {
$z1 close
} -result ABCDEedbca..
test zlib-7.10 {zlib stream finalize (bug 25842c161)} -constraints zlib -setup {
set z2 [zlib stream gzip]
} -body {
$z2 put -finalize ABCDEedbca..
zlib gunzip [$z2 get]
} -cleanup {
$z2 close
} -result ABCDEedbca..
test zlib-7.11 {zlib stream put -finalize (bug 25842c161)} -constraints zlib -setup {
set c [zlib stream gzip]
set d [zlib stream gunzip]
} -body {
$c put abcdeEDCBA..
$c finalize
$d put [$c get]
$d finalize
$d get
} -cleanup {
$c close
$d close
} -result abcdeEDCBA..
test zlib-7.12 {zlib stream put; zlib stream finalize (bug 25842c161)} -constraints zlib -setup {
set c [zlib stream gzip]
set d [zlib stream gunzip]
} -body {
$c put -finalize abcdeEDCBA..
$d put -finalize [$c get]
$d get
} -cleanup {
$c close
$d close
} -result abcdeEDCBA..
test zlib-8.1 {zlib transformation} -constraints zlib -setup {
set file [makeFile {} test.gz]
} -body {
set f [zlib push gzip [open $file w] -header {comment gorp}]
puts $f "ok"
close $f
|