naruse	2016-01-15 00:06:37 +0900 (Fri, 15 Jan 2016)

  New Revision: 53536

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53536

  Log:
    merge revision(s) 53535:
    
    * lib/uri/generic.rb (URI::Generic#to_s): change encoding to
      UTF-8 as Ruby 2.2/ by Koichi ITO <koic.ito@g...>
      https://github.com/ruby/ruby/pull/1188 fix GH-1188

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/lib/uri/generic.rb
    branches/ruby_2_3/test/uri/test_generic.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 53535)
+++ ruby_2_3/version.h	(revision 53536)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-01-12"
-#define RUBY_PATCHLEVEL 4
+#define RUBY_RELEASE_DATE "2016-01-15"
+#define RUBY_PATCHLEVEL 5
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 
Index: ruby_2_3/test/uri/test_generic.rb
===================================================================
--- ruby_2_3/test/uri/test_generic.rb	(revision 53535)
+++ ruby_2_3/test/uri/test_generic.rb	(revision 53536)
@@ -768,6 +768,7 @@ class URI::TestGeneric < Test::Unit::Tes https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/uri/test_generic.rb#L768
   def test_build
     u = URI::Generic.build(['http', nil, 'example.com', 80, nil, '/foo', nil, nil, nil])
     assert_equal('http://example.com:80/foo', u.to_s)
+    assert_equal(Encoding::UTF_8, u.to_s.encoding)
 
     u = URI::Generic.build(:port => "5432")
     assert_equal(":5432", u.to_s)
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 53535)
+++ ruby_2_3/ChangeLog	(revision 53536)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Jan 15 00:05:57 2016  NARUSE, Yui  <naruse@r...>
+
+	* lib/uri/generic.rb (URI::Generic#to_s): change encoding to
+	  UTF-8 as Ruby 2.2/ by Koichi ITO <koic.ito@g...>
+	  https://github.com/ruby/ruby/pull/1188 fix GH-1188
+
 Tue Jan 12 17:23:39 2016  NAKAMURA Usaku  <usa@r...>
 
 	* process.c (rb_execarg_parent_start1): need to convert the encoding to
Index: ruby_2_3/lib/uri/generic.rb
===================================================================
--- ruby_2_3/lib/uri/generic.rb	(revision 53535)
+++ ruby_2_3/lib/uri/generic.rb	(revision 53536)
@@ -1341,7 +1341,7 @@ module URI https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/uri/generic.rb#L1341
     # Constructs String from URI
     #
     def to_s
-      str = String.new
+      str = ''.dup
       if @scheme
         str << @scheme
         str << ':'

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53535


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