mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/uri/generic.rb (URI::Generic::userinfo): should support
empty password. [ruby-core:10290] * lib/uri/generic.rb (URI::Generic::set_password): password can be cleared by nil. [ruby-core:10290] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1e41cf4885
commit
bcbdd1f660
2 changed files with 12 additions and 2 deletions
|
@ -337,7 +337,7 @@ module URI
|
|||
protected :set_user
|
||||
|
||||
def set_password(v)
|
||||
set_userinfo(@user, v)
|
||||
@password = v
|
||||
v
|
||||
end
|
||||
protected :set_password
|
||||
|
@ -356,7 +356,9 @@ module URI
|
|||
private :escape_userpass
|
||||
|
||||
def userinfo
|
||||
if !@password
|
||||
if @user.nil? or @user.empty?
|
||||
nil
|
||||
elsif @password.nil? or @password.empty?
|
||||
@user
|
||||
else
|
||||
@user + ':' + @password
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue