1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f0cd7e8f5e..d37133e553 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 18 16:36:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
+	  disallow interrupt by type conversion.  fixed: [ruby-dev:25226]
+
 Sat Dec 18 15:09:02 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/webrick/httpauth.rb,