diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 17:58:25 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 17:58:25 +0000 |
commit | b940547cb9c9a5d29f72ad2683e8868bc389c5e1 (patch) | |
tree | e81d7b131df6b3f03cf98b7878a28da61bf8587b | |
parent | 4c1e0db035879683aff84782738b69078c2bb3d5 (diff) |
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
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | lib/net/telnet.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -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] diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index c5f8b0429a..80b95a5149 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"] @@ -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 |