зеркало из https://github.com/github/ruby.git
* encoding.c (rb_filesystem_encindex): avoid infinite require
loop. [ruby-core:30467] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
8e9f30887c
Коммит
2f9d028202
|
@ -1,3 +1,8 @@
|
||||||
|
Sat May 29 12:56:09 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>
|
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.
|
* lib/rdoc/rdoc.rb (RDoc#read_file_contents): take care of BOM.
|
||||||
|
|
|
@ -1160,7 +1160,7 @@ rb_filesystem_encindex(void)
|
||||||
{
|
{
|
||||||
int idx = rb_enc_registered("filesystem");
|
int idx = rb_enc_registered("filesystem");
|
||||||
if (idx < 0)
|
if (idx < 0)
|
||||||
idx = enc_set_filesystem_encoding();
|
idx = rb_ascii8bit_encindex();
|
||||||
return idx;
|
return idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче