diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-19 00:07:25 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-19 00:07:25 +0000 |
| commit | d371e3583e3b1e0692f92343017b62d2628190ff (patch) | |
| tree | be82924ada754f8542f394d0a3d28e0a0b02a098 /lib/uri | |
| parent | 1fae66fca28167ca0e25625091c5df49405b8023 (diff) | |
* lib: revert r31635-r31638 and untabify with expand(1).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/uri')
| -rw-r--r-- | lib/uri/common.rb | 10 | ||||
| -rw-r--r-- | lib/uri/generic.rb | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb index 10f77caecb..aaafeba478 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -202,13 +202,13 @@ module URI # # == Usage # - # p = URI::Parser.new - # p.parse("ldap://ldap.example.com/dc=example?user=john") - # #=> #<URI::LDAP:0x00000000b9e7e8 URL:ldap://ldap.example.com/dc=example?user=john> + # p = URI::Parser.new + # p.parse("ldap://ldap.example.com/dc=example?user=john") + # #=> #<URI::LDAP:0x00000000b9e7e8 URL:ldap://ldap.example.com/dc=example?user=john> # def parse(uri) scheme, userinfo, host, port, - registry, path, opaque, query, fragment = self.split(uri) + registry, path, opaque, query, fragment = self.split(uri) if scheme && URI.scheme_list.include?(scheme.upcase) URI.scheme_list[scheme.upcase].new(scheme, userinfo, host, port, @@ -273,7 +273,7 @@ module URI # unless +schemes+ is provided. Then it is a Regexp.union with self.pattern[:X_ABS_URI] def make_regexp(schemes = nil) unless schemes - @regexp[:ABS_URI_REF] + @regexp[:ABS_URI_REF] else /(?=#{Regexp.union(*schemes)}:)#{@pattern[:X_ABS_URI]}/x end diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index 78e3fc05f7..a37649545a 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -1321,8 +1321,8 @@ module URI self.query, self.fragment, parser) if rel.userinfo != oth.userinfo || - rel.host.to_s.downcase != oth.host.to_s.downcase || - rel.port != oth.port + rel.host.to_s.downcase != oth.host.to_s.downcase || + rel.port != oth.port if self.userinfo.nil? && self.host.nil? return self, self.dup |