From aab56e10c8776dc826f53eb5589d898be04b434c Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 17:57:53 +0000 Subject: 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_5@16913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 14 ++++++++++++++ lib/net/telnet.rb | 2 +- version.h | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4beb7ccfba..d6a1f07f07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Sun Jun 8 02:57:32 2008 James Edward Gray II + + 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 + + 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:54:30 2008 Nobuyoshi Nakada * io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093] diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index a2f6065dd7..c54401851c 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -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"] diff --git a/version.h b/version.h index 8233b528c6..5f1c8931d0 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 138 +#define RUBY_PATCHLEVEL 139 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3