mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 13779:13782:
Merged 13781 from trunk. * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in addition to "password" for Telnet login prompts. [ruby-Bugs-10746] Merged 13779 from trunk. * lib/net/telnet.rb (Net::Telnet#login): Making the password prompt pattern case insensitive. [ruby-Bugs-10746] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4c1e0db035
commit
b940547cb9
3 changed files with 16 additions and 2 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
Sun Jun 8 02:58:19 2008 James Edward Gray II <jeg2@ruby-lang.org>
|
||||
|
||||
Merged 13781 from trunk.
|
||||
|
||||
* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
|
||||
addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
|
||||
|
||||
Wed Oct 25 06:46:21 2007 James Edward Gray II <jeg2@ruby-lang.org>
|
||||
|
||||
Merged 13779 from trunk.
|
||||
|
||||
* lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
|
||||
pattern case insensitive. [ruby-Bugs-10746]
|
||||
|
||||
Sun Jun 8 02:55:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093]
|
||||
|
|
|
|||
|
|
@ -705,7 +705,7 @@ module Net
|
|||
# data is also yielded to the block as it is received.
|
||||
def login(options, password = nil) # :yield: recvdata
|
||||
login_prompt = /[Ll]ogin[: ]*\z/n
|
||||
password_prompt = /Password[: ]*\z/n
|
||||
password_prompt = /[Pp]ass(?:word|phrase)[: ]*\z/n
|
||||
if options.kind_of?(Hash)
|
||||
username = options["Name"]
|
||||
password = options["Password"]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#define RUBY_RELEASE_DATE "2008-06-08"
|
||||
#define RUBY_VERSION_CODE 186
|
||||
#define RUBY_RELEASE_CODE 20080608
|
||||
#define RUBY_PATCHLEVEL 137
|
||||
#define RUBY_PATCHLEVEL 138
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue