archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 34433: [Backport #6153]

Browse source 
* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
  is ascii only string. [ruby-core:42354] [Bug #5968]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-03-18 05:26:07 +00:00
parent 815d88b569
commit 58f269d070
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Mar 18 13:23:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
is ascii only string. [ruby-core:42354] [Bug #5968]
Tue Mar 6 18:55:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/assertions.rb (assert_send, assert_not_send):

1
encoding.c
View file

@ -804,7 +804,6 @@ rb_enc_compatible(VALUE str1, VALUE str2)
if (cr2 == ENC_CODERANGE_7BIT) return enc1;
}
if (cr2 == ENC_CODERANGE_7BIT) {
if (idx1 == ENCINDEX_ASCII) return enc2;
return enc1;
}
}

14
test/ruby/test_encoding.rb
View file

@ -99,4 +99,18 @@ class TestEncoding < Test::Unit::TestCase
str2 = Marshal.load(Marshal.dump(str2))
assert_equal(str, str2, '[ruby-dev:38596]')
end
def test_unsafe
bug5279 = '[ruby-dev:44469]'
assert_ruby_status([], '$SAFE=4; "a".encode("utf-16be")', bug5279)
end
def test_compatible_p
ua = "abc".force_encoding(Encoding::UTF_8)
assert_equal(Encoding::UTF_8, Encoding.compatible?(ua, :abc))
assert_equal(nil, Encoding.compatible?(ua, 1))
bin = "a".force_encoding(Encoding::ASCII_8BIT)
asc = "b".force_encoding(Encoding::US_ASCII)
assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc))
end
end

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 164
#define RUBY_PATCHLEVEL 165
#define RUBY_RELEASE_DATE "2012-03-16"
#define RUBY_RELEASE_DATE "2012-03-18"
#define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 16
#define RUBY_RELEASE_DAY 18
#include "ruby/version.h"