Skip to content

Commit 908cd08

Browse files
author
Hiroshi Nakamura
committed
Squashed commit of the following:
commit 1af2514 Author: Hiroshi Nakamura <[email protected]> Date: Tue Oct 4 17:01:58 2011 +0900 Add TODO for crc_table crc_table is also in JZlib. We don't want to have it by ourselves. commit 3a59213 Author: Hiroshi Nakamura <[email protected]> Date: Tue Oct 4 16:57:48 2011 +0900 Update tags for new zlib implementation * Add mtime tag for 1.9 as well as 1.8 * Remove tags which now get green with new zlib commit 21eaa91 Author: Hiroshi Nakamura <[email protected]> Date: Tue Oct 4 14:51:53 2011 +0900 Prepare for merging new zlib impl by ymnk * Remove unused implementation for Inflate, Deflate, GzipReader and GzipWriter (all replaced by ymnk with helps from JZlib) * Remove duplicated constant definitions in Zlib.java * Move RaiseException helper methods from Util.java to RubyZlib.java (We can remove Util.java now) * Fix a bug to avoid IndexOutOfBoundException raised from GzipWriter#write when the argument is empty String. * Tag 1 RubySpec failure which expects following code to fail with 'header already written'. It's JZlib's incompatibility but I (NaHi) don't think it's a 'bug' of JZlib. Zlib::GzipWriter.wrap(StringIO.new) { |io| io.write("a"); io.mtime = nil } * Update Eclipse classpath setting commit a87ad3e Author: Atsuhiko Yamanaka <[email protected]> Date: Tue Sep 20 12:38:39 2011 +0900 Re-implement Zlib::GzipReader and Zlib::GzipWriter with jzlib. * using JZlib 1.1.0 build_lib/jzlib-1.1.0.jar is built from https://github.com/ymnk/jzlib/tree/1.1.0 * working around JRUBY-6073 (61633af) * GzipReader will throw appropieate exceptions for broken input. (1cd2f52) * NoFooter if not enough trailer data exits, * CRCError if incorrect checksum data is found, * LengthError if incorrect length data is found, * GzipFile::Error if header is broken or EOF is countered before trailer, * DataError if invalid compression data is found. * Note that the previous JRuby had thrown IOError instead of DataError. * Fix 'Zlib::Inflate#<< properly handles incomplete data ERROR' on RubySpec. (710dbba) * Support Zlib::File:Error#input (41eff81) * Since Ruby 1.9, Zlib::File:Error#input has been introduced. According to the source code of CRuby, it will be setted at the failure in parsing the gzip header. * Support some methods additionaly (90dc869) * GzipReader#unused, * GzipWriter#sync, GzipWriter#sync= * GzipWriter#flush
1 parent 9134a85 commit 908cd08

File tree

12 files changed

+488
-1335
lines changed

12 files changed

+488
-1335
lines changed

.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<classpathentry kind="lib" path="build_lib/asm-commons-4.0_RC2.jar"/>
3838
<classpathentry kind="lib" path="build_lib/asm-tree-4.0_RC2.jar"/>
3939
<classpathentry kind="lib" path="build_lib/asm-util-4.0_RC2.jar"/>
40-
<classpathentry kind="lib" path="build_lib/jzlib-gzip.jar"/>
4140
<classpathentry kind="lib" path="build_lib/snakeyaml-1.9.jar"/>
41+
<classpathentry kind="lib" path="build_lib/jzlib-1.1.0.jar"/>
4242
<classpathentry kind="output" path="build.eclipse"/>
4343
</classpath>

build.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
<zipfileset src="${build.lib.dir}/yecht.jar"/>
391391
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
392392
<zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
393-
<zipfileset src="${build.lib.dir}/jzlib-gzip.jar"/>
393+
<zipfileset src="${build.lib.dir}/jzlib-1.1.0.jar"/>
394394
<metainf dir="spi">
395395
<include name="services/**"/>
396396
</metainf>
@@ -493,7 +493,7 @@
493493
<zipfileset src="${build.lib.dir}/yecht.jar"/>
494494
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
495495
<zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
496-
<zipfileset src="${build.lib.dir}/jzlib-gzip.jar"/>
496+
<zipfileset src="${build.lib.dir}/jzlib-1.1.0.jar"/>
497497
<metainf dir="spi">
498498
<include name="services/**"/>
499499
</metainf>
@@ -652,7 +652,7 @@
652652
<zipfileset src="${build.lib.dir}/yecht.jar"/>
653653
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
654654
<zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
655-
<zipfileset src="${build.lib.dir}/jzlib-gzip.jar"/>
655+
<zipfileset src="${build.lib.dir}/jzlib-1.1.0.jar"/>
656656
<metainf dir="spi">
657657
<include name="services/**"/>
658658
</metainf>

build_lib/jzlib-1.1.0.jar

67 KB
Binary file not shown.

build_lib/jzlib-gzip.jar

-57.9 KB
Binary file not shown.

spec/tags/1.8/ruby/library/zlib/deflate/params_tags.txt

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fails:Zlib::GzipWriter#mtime= raises if the header was written

spec/tags/1.9/ruby/library/zlib/gzipreader/getc_tags.txt

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fails:Zlib::GzipWriter#mtime= raises if the header was written

0 commit comments

Comments
 (0)