kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r20068 from trunk into ruby_1_9_1.

Browse source 
* encoding.c (rb_enc_set_default_internal): no alias "internal" if
  defalt internal is not set.  [ruby-dev:37000]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-10-31 13:55:58 +00:00
parent c45f86973c
commit 670c707a2f
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Oct 31 11:35:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_set_default_internal): no alias "internal" if
defalt internal is not set. [ruby-dev:37000]
Fri Oct 31 21:28:14 2008 Yusuke Endoh <mame@tsg.ne.jp>
* lib/webrick/httpauth/digestauth.rb

9
encoding.c
View file

@ -1101,8 +1101,13 @@ rb_enc_set_default_internal(VALUE encoding)
if (default_internal_index != -2)
/* Already set */
return;
default_internal_index = encoding == Qnil ?
-1 :rb_enc_to_index(rb_to_encoding(encoding));
if (NIL_P(encoding)) {
default_internal_index = -1;
default_internal = 0;
return;
}
default_internal_index = rb_enc_to_index(rb_to_encoding(encoding));
/* Convert US-ASCII => UTF-8 */
if (default_internal_index == rb_usascii_encindex())
default_internal_index = rb_utf8_encindex();