yugui	2011-02-18 19:43:48 +0900 (Fri, 18 Feb 2011)

  New Revision: 30901

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

  Log:
    merges r30721 from trunk into ruby_1_9_2.
    --
    * array.c (rb_ary_join): [].join.encoding must be US-ASCII.
      [ruby-list:47790]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/array.c
    branches/ruby_1_9_2/test/ruby/test_array.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/array.c
===================================================================
--- ruby_1_9_2/array.c	(revision 30900)
+++ ruby_1_9_2/array.c	(revision 30901)
@@ -1643,7 +1643,7 @@
     int untrust = FALSE;
     VALUE val, tmp, result;
 
-    if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
+    if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
     if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = TRUE;
     if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = TRUE;
 
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30900)
+++ ruby_1_9_2/ChangeLog	(revision 30901)
@@ -1,3 +1,8 @@
+Sat Jan 29 22:16:26 2011  NARUSE, Yui  <naruse@r...>
+
+	* array.c (rb_ary_join): [].join.encoding must be US-ASCII.
+	  [ruby-list:47790]
+
 Fri Jan 28 12:05:48 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* configure.in: Add #include<sys/stat.h> when struct stat is
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30900)
+++ ruby_1_9_2/version.h	(revision 30901)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 178
+#define RUBY_PATCHLEVEL 179
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/ruby/test_array.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_array.rb	(revision 30900)
+++ ruby_1_9_2/test/ruby/test_array.rb	(revision 30901)
@@ -890,6 +890,7 @@
     a = @cls[]
     assert_equal("", a.join)
     assert_equal("", a.join(','))
+    assert_equal(Encoding::US_ASCII, a.join.encoding)
 
     $, = ""
     a = @cls[1, 2]

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