naruse	2010-05-29 13:56:06 +0900 (Sat, 29 May 2010)

  New Revision: 28064

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

  Log:
    merge revision(s) 28063:
    * encoding.c (rb_filesystem_encindex): avoid infinite require
      loop. [ruby-core:30467]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/encoding.c

Index: ruby_1_9_2/encoding.c
===================================================================
--- ruby_1_9_2/encoding.c	(revision 28063)
+++ ruby_1_9_2/encoding.c	(revision 28064)
@@ -1160,7 +1160,7 @@
 {
     int idx = rb_enc_registered("filesystem");
     if (idx < 0)
-	idx = enc_set_filesystem_encoding();
+	idx = rb_ascii8bit_encindex();
     return idx;
 }
 
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28063)
+++ ruby_1_9_2/ChangeLog	(revision 28064)
@@ -1,3 +1,8 @@
+Sat May 29 13:55:22 2010  NARUSE, Yui  <naruse@r...>
+
+	* encoding.c (rb_filesystem_encindex): avoid infinite require
+	  loop. [ruby-core:30467]
+
 Sat May 29 12:05:51 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rdoc/rdoc.rb (RDoc#read_file_contents): take care of BOM.

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