diff options
| author | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-01 15:09:29 +0000 |
|---|---|---|
| committer | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-01 15:09:29 +0000 |
| commit | 889c22455a700cf607d5a6f192eb81f68c0f7cde (patch) | |
| tree | 926cf7c79e51c038635bd8f06e4e4044ff1bd163 | |
| parent | 87e3939dcd6d1893ba3f0e00e4dc1c850a02f826 (diff) | |
Merged 16257 from trunk.
* lib/net/telnet.rb: This patch from Brian Candler adds a FailEOF mode which
can be activated to have net/telnet raise EOFError exceptions when the
remote connection is closed. The default behavior remains unchanged though.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/net/telnet.rb | 7 |
2 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Thu May 1 23:57:06 2008 James Edward Gray II <jeg2@ruby-lang.org> + + Merged 16257 from trunk. + + * lib/net/telnet.rb: This patch from Brian Candler adds a FailEOF mode which + can be activated to have net/telnet raise EOFError exceptions when the + remote connection is closed. The default behavior remains unchanged though. + Thu May 1 23:43:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * range.c (range_step): check if step can be converted to an integer. diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index a55527f15e..73471c3327 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -520,10 +520,15 @@ module Net # value specified when this instance was created will be # used, or, failing that, the default value of 0 seconds, # which means not to wait for more input. + # FailEOF:: if true, when the remote end closes the connection then an + # EOFError will be raised. Otherwise, defaults to the old + # behaviour that the function will return whatever data + # has been received already, or nil if nothing was received. # def waitfor(options) # :yield: recvdata time_out = @options["Timeout"] waittime = @options["Waittime"] + fail_eof = @options["FailEOF"] if options.kind_of?(Hash) prompt = if options.has_key?("Match") @@ -535,6 +540,7 @@ module Net end time_out = options["Timeout"] if options.has_key?("Timeout") waittime = options["Waittime"] if options.has_key?("Waittime") + fail_eof = options["FailEOF"] if options.has_key?("FailEOF") else prompt = options end @@ -586,6 +592,7 @@ module Net line += buf yield buf if block_given? rescue EOFError # End of file reached + raise if fail_eof if line == '' line = nil yield nil if block_given? |