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

* lib/uri/generic.rb (URI::Generic::userinfo): Considering how

Browse source 
`scheme://user:@...', `scheme://:password@...' and
  `scheme://:@...' are parsed, an empty user name or password
  should be allowed and represented as it is.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2007-02-15 07:45:04 +00:00
parent fba5bff993
commit eb3bb4873f
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Feb 15 16:44:14 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/uri/generic.rb (URI::Generic::userinfo): Considering how
`scheme://user:@...', `scheme://:password@...' and
`scheme://:@...' are parsed, an empty user name or password
should be allowed and represented as it is.
Thu Feb 15 11:46:05 2007 KIMURA Koichi <hogemuta@gmail.com>
* dir.c, win32/win32.c, win32/dir.h, ruby.h, intern.h: Bring

12
lib/uri/generic.rb
View file

@ -304,19 +304,19 @@ module URI
end
check_userinfo(*userinfo)
set_userinfo(*userinfo)
userinfo
# returns userinfo
end
def user=(user)
check_user(user)
set_user(user)
user
# returns user
end
def password=(password)
check_password(password)
set_password(password)
password
# returns password
end
def set_userinfo(user, password = nil)
@ -338,7 +338,7 @@ module URI
def set_password(v)
@password = v
v
# returns v
end
protected :set_password
@ -356,9 +356,9 @@ module URI
private :escape_userpass
def userinfo
if @user.nil? or @user.empty?
if @user.nil?
nil
elsif @password.nil? or @password.empty?
elsif @password.nil?
@user
else
@user + ':' + @password