summaryrefslogtreecommitdiff
path: root/lib/uri/generic.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/uri/generic.rb')
-rw-r--r--lib/uri/generic.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index 4d3ab67b7e..1510e53eeb 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -494,7 +494,7 @@ Object
else
if v && v != '' && ABS_PATH !~ v && REL_PATH !~ v
raise InvalidComponentError,
- "bad component(expected relative path component): #{@path}"
+ "bad component(expected relative path component): #{v}"
end
end
@@ -688,7 +688,7 @@ Object
end
# RFC2396, Section 5.2, 6), a)
- base_path.pop if !base_path.last.empty?
+ base_path.pop unless base_path.size == 1
# RFC2396, Section 5.2, 6), c)
# RFC2396, Section 5.2, 6), d)
@@ -719,7 +719,7 @@ Object
# valid absolute path
# end
base_path << x
- base_path += tmp
+ tmp.each {|t| base_path << t}
add_trailer_slash = false
break
end