shyouhei	2011-05-21 07:29:01 +0900 (Sat, 21 May 2011)

  New Revision: 31662

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31662

  Log:
    merge revision(s) 30552:
    
    * ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in gzip's header
      is the size of uncompressed input data modulo 2^32.
      [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/zlib/zlib.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/zlib/zlib.c
===================================================================
--- ruby_1_8_7/ext/zlib/zlib.c	(revision 31661)
+++ ruby_1_8_7/ext/zlib/zlib.c	(revision 31662)
@@ -2090,7 +2090,7 @@
     if (gz->crc != crc) {
 	rb_raise(cCRCError, "invalid compressed data -- crc error");
     }
-    if (gz->z.stream.total_out != length) {
+    if ((gz->z.stream.total_out & 0xFFFFFFFFUL) != length) {
 	rb_raise(cLengthError, "invalid compressed data -- length error");
     }
 }
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 31661)
+++ ruby_1_8_7/ChangeLog	(revision 31662)
@@ -1,3 +1,9 @@
+Sat May 21 00:55:21 2011  NARUSE, Yui  <naruse@r...>
+
+	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in gzip's
+	header is the size of uncompressed input data modulo 2^32.
+	[ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
+
 Fri May 20 23:46:44 2011  NAKAMURA Usaku  <usa@r...>
 
 	* ext/socket/{getaddrinfo,getnameinfo}.c: include winsock2.h only when
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 31661)
+++ ruby_1_8_7/version.h	(revision 31662)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2011-05-21"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20110521
-#define RUBY_PATCHLEVEL 338
+#define RUBY_PATCHLEVEL 339
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/