1 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2db990b97..e7c12e583 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Thu Oct 23 01:26:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_conv_enc_opts): new function to convert with
+	  specifying ecflags and ecopts.
+
+	* ext/zlib/zlib.c (gzfile_newstr): specify ecflags and ecopts for
+	  conversion using above function.
+
+	* ext/zlib/zlib.c (gzfile_newstr): use own rb_econv_t for dummy
+	  encoding to handling stateful encoding (e.g. iso-2022-jp).
+	  [ruby-dev:36857]
+
+	* ext/zlib/zlib.c (gzfile_getc): ditto.
+
 Thu Oct 23 01:24:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_tmpsrc): get rid of side effects.