archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 28063:

Browse source 
* 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
This commit is contained in:
naruse 2010-05-29 04:56:06 +00:00
parent 5668c8ac5e
commit cdf3ba0df6
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

2
encoding.c
View file

@ -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;
}