naruse	2012-02-06 00:17:50 +0900 (Mon, 06 Feb 2012)

  New Revision: 34433

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34433

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

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/test/ruby/test_encoding.rb

Index: encoding.c
===================================================================
--- encoding.c	(revision 34432)
+++ encoding.c	(revision 34433)
@@ -812,7 +812,6 @@
 		if (cr2 == ENC_CODERANGE_7BIT) return enc1;
 	    }
 	    if (cr2 == ENC_CODERANGE_7BIT) {
-		if (idx1 == ENCINDEX_ASCII) return enc2;
 		return enc1;
 	    }
 	}
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34432)
+++ ChangeLog	(revision 34433)
@@ -1,3 +1,8 @@
+Mon Feb  6 00:16:27 2012  NARUSE, Yui  <naruse@r...>
+
+	* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
+	  is ascii only string. [ruby-core:42354] [Bug #5968]
+
 Fri Feb  3 07:16:47 2012  Eric Hodel  <drbrain@s...>
 
 	* lib/webrick.rb:  Moved proxy rewriting to WEBrick::HTTPProxy.
Index: test/ruby/test_encoding.rb
===================================================================
--- test/ruby/test_encoding.rb	(revision 34432)
+++ test/ruby/test_encoding.rb	(revision 34433)
@@ -109,5 +109,8 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/