mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
aamine
* lib/net/http.rb: add HTTPRequest#basic_auth. * lib/net/smtp.rb: raise if only account or password is given. * lib/net/protocol.rb: WriteAdapter#<< returns self. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e502549be1
commit
1a7cb01d64
4 changed files with 25 additions and 8 deletions
|
@ -1,3 +1,11 @@
|
|||
Tue Mar 13 14:54:39 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
|
||||
|
||||
* lib/net/http.rb: add HTTPRequest#basic_auth.
|
||||
|
||||
* lib/net/smtp.rb: raise if only account or password is given.
|
||||
|
||||
* lib/net/protocol.rb: WriteAdapter#<< returns self.
|
||||
|
||||
<<<<<<< ChangeLog
|
||||
Tue Mar 13 14:41:16 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
|
|
|
@ -504,7 +504,10 @@ module Net
|
|||
end
|
||||
|
||||
def self.get_print( addr, path, port = nil )
|
||||
print get( addr, path, port )
|
||||
new( addr, port || HTTP.port ).start {|http|
|
||||
http.get path, nil, $stdout
|
||||
}
|
||||
nil
|
||||
end
|
||||
|
||||
|
||||
|
@ -733,7 +736,7 @@ module Net
|
|||
end
|
||||
|
||||
def basic_auth( acc, pass )
|
||||
@header['authorization'] = ["#{acc}:#{pass}"].pack('m').gsub(/\s+/, '')
|
||||
@header['authorization'] = 'Basic ' + ["#{acc}:#{pass}"].pack('m').strip
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -363,7 +363,10 @@ module Net
|
|||
@sock.__send__ @mid, str
|
||||
end
|
||||
|
||||
alias << write
|
||||
def <<( str )
|
||||
@sock.__send__ @mid, str
|
||||
self
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
|
@ -153,12 +153,15 @@ module Net
|
|||
end
|
||||
end
|
||||
|
||||
if user and secret then
|
||||
if user or secret then
|
||||
(user and secret) or
|
||||
raise ArgumentError, "both of account and password are required"
|
||||
|
||||
mid = 'auth_' + (authtype || 'cram_md5').to_s
|
||||
unless @command.respond_to? mid then
|
||||
raise ArgumentError, "wrong auth type #{authtype.to_s}"
|
||||
end
|
||||
@command.send mid, user, secret
|
||||
@command.respond_to? mid or
|
||||
raise ArgumentError, "wrong auth type #{authtype.to_s}"
|
||||
|
||||
@command.__send__ mid, user, secret
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue