ruby-changes:5411
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 02:58:17 +0900 (JST)
Subject: [ruby-changes:5411] Ruby:r16913 (ruby_1_8_5): merge revision(s) 13779:13782:
shyouhei 2008-06-08 02:57:53 +0900 (Sun, 08 Jun 2008) New Revision: 16913 Modified files: branches/ruby_1_8_5/ChangeLog branches/ruby_1_8_5/lib/net/telnet.rb branches/ruby_1_8_5/version.h Log: 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] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/net/telnet.rb?r1=16913&r2=16912&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16913&r2=16912&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16913&r2=16912&diff_format=u Index: ruby_1_8_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 16912) +++ ruby_1_8_5/ChangeLog (revision 16913) @@ -1,3 +1,17 @@ +Sun Jun 8 02:57:32 2008 James Edward Gray II <jeg2@r...> + + 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@r...> + + 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 <nobu@r...> * io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093] Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 16912) +++ ruby_1_8_5/version.h (revision 16913) @@ -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 Index: ruby_1_8_5/lib/net/telnet.rb =================================================================== --- ruby_1_8_5/lib/net/telnet.rb (revision 16912) +++ ruby_1_8_5/lib/net/telnet.rb (revision 16913) @@ -705,7 +705,7 @@ # 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"] -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/