kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merged differences between uri-0.9.6 and uri-0.9.7

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akira 2002-06-12 09:32:35 +00:00
parent 91511afa9c
commit b8be8d535a
4 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/uri/common.rb
View file

@ -145,14 +145,14 @@ module URI
X_ABS_URI = "
(#{PATTERN::SCHEME}): (?# 1: scheme)
(?:
(?:
(?:(?:
//(?:
(?:(?:(#{PATTERN::USERINFO})@)? (?# 2: userinfo)
(?:(#{PATTERN::HOST})(?::(\\d*))?))?(?# 3: host, 4: port)
|
(#{PATTERN::REG_NAME}) (?# 5: registry)
)
(#{PATTERN::ABS_PATH})? (?# 6: path)
))?
((?!//)#{PATTERN::ABS_PATH})? (?# 6: path)
)(?:\\?(#{PATTERN::QUERY}))? (?# 7: query)
|
(#{PATTERN::OPAQUE_PART}) (?# 8: opaque)
@ -231,7 +231,7 @@ module URI
end
else
raise ArgumentError,
"expected Array of or Hash of compornents of #{klass.to_s} (#{klass.component[1..-1].join(', ')})"
"expected Array of or Hash of components of #{klass.to_s} (#{klass.component[1..-1].join(', ')})"
end
tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase