summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-15 00:42:25 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-15 00:42:25 +0000
commit7588f09a87a7d89404e2d6036c71e124c8c403ae (patch)
tree20dd8f501824f5b086265445fc5a87bc14349911
parent732d041dc8d0892cc0f8f3ecbd3a59a8908d4763 (diff)
* lib/uri/common.rb (URI.encode_www_component):
call str.to_s at first. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/uri/common.rb6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fb965b6ba0..4b82399822 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 15 09:34:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/common.rb (URI.encode_www_component):
+ call str.to_s at first.
+
Mon Mar 15 09:36:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* symbian/README.SYMBIAN: fixed broken patch and converted to
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 19ca44d7bc..b4de6ad40c 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -743,9 +743,11 @@ module URI
end
TBLENCWWWCOMP_.freeze
end
- str = str.dup.force_encoding(Encoding::ASCII_8BIT)
+ str = str.to_s.dup
+ enc = str.encoding
+ str.force_encoding(Encoding::ASCII_8BIT)
str.gsub!(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_)
- str
+ str.force_encoding(enc)
end
# Decode given +str+ of URL-encoded form data.