summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-14 15:06:37 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-14 15:06:37 +0000
commit37c5197b9f24ee152660909ed97c51b38baa5128 (patch)
tree4ab7502698f461a33c766661a2ee7fd18ac24cd4 /lib
parent9835b48a385c7f6663945a325d2165a1c07cc3a9 (diff)
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@gmail.com> https://github.com/ruby/ruby/pull/1188 fix GH-1188 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@53536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/uri/generic.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index 224a16317b..aba54c14b6 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1341,7 +1341,7 @@ module URI
# Constructs String from URI
#
def to_s
- str = String.new
+ str = ''.dup
if @scheme
str << @scheme
str << ':'