From cdf3ba0df66a0c23e3a94d860a042678fc70d76e Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 29 May 2010 04:56:06 +0000
Subject: merge revision(s) 28063: 	* encoding.c (rb_filesystem_encindex):
 avoid infinite require 	  loop. [ruby-core:30467]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 5 +++++
 encoding.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cd5b11c4d3..8d1f320116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 29 13:55:22 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c (rb_filesystem_encindex): avoid infinite require
+	  loop. [ruby-core:30467]
+
 Sat May 29 12:05:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/rdoc.rb (RDoc#read_file_contents): take care of BOM.
diff --git a/encoding.c b/encoding.c
index 001762221f..83607d5103 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1160,7 +1160,7 @@ rb_filesystem_encindex(void)
 {
     int idx = rb_enc_registered("filesystem");
     if (idx < 0)
-	idx = enc_set_filesystem_encoding();
+	idx = rb_ascii8bit_encindex();
     return idx;
 }
 
-- 
cgit v1.2.3