mirror of
https://github.com/ruby/ruby.git
synced 2025-09-16 00:54:01 +02:00
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
This commit is contained in:
parent
5668c8ac5e
commit
cdf3ba0df6
2 changed files with 6 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue