mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib: Convert tabs to spaces for ruby files per
http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style Patch by Steve Klabnik [Ruby 1.9 - Bug #4730] Patch by Jason Dew [Ruby 1.9 - Feature #4718] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
34276148c4
commit
7bbf2f3085
67 changed files with 3823 additions and 3814 deletions
|
@ -1,3 +1,10 @@
|
|||
Thu May 19 06:16:41 2011 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib: Convert tabs to spaces for ruby files per
|
||||
http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
|
||||
Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
|
||||
Patch by Jason Dew [Ruby 1.9 - Feature #4718]
|
||||
|
||||
Thu May 19 06:06:07 2011 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib/cgi/util.rb: Improve documentation. Patch by Clinton Nixon.
|
||||
|
|
|
@ -1323,9 +1323,11 @@ module URI
|
|||
if rel.userinfo != oth.userinfo ||
|
||||
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
|
||||
end
|
||||
|
||||
rel.set_port(nil) if rel.port == oth.default_port
|
||||
return rel, rel
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue