diff options
| author | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-06-12 09:32:35 +0000 |
|---|---|---|
| committer | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-06-12 09:32:35 +0000 |
| commit | b8be8d535a32c9f0ab54482cbf09fdcd9e0abee8 (patch) | |
| tree | ee784974f824eff9dcc5045196829e58b3a07b43 /lib/uri/common.rb | |
| parent | 91511afa9ca2b4ebaa751bc1f53e89faab6b3701 (diff) | |
merged differences between uri-0.9.6 and uri-0.9.7
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/uri/common.rb')
| -rw-r--r-- | lib/uri/common.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb index 6f2fa81ad2..ea7d3c8865 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -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 |