From e3c74614dd0495b78acba3fa0620ce5bb0745640 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 3 Jun 2003 09:40:21 +0000 Subject: * eval.c (rb_call_super): inheritance line adjustment moved from rb_call(). [ruby-core:01113] * eval.c (rb_eval): use rb_call_super() to follow DRY principle. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/imap.rb | 4 ++-- lib/net/telnet.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/net') diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 2cbb40816..1007f2bdf 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -263,7 +263,7 @@ Object If this mailbox exists, an array containing objects of (()) will be returned. -: add_response_handler(handler = Proc.new) +: add_response_handler(handler = Block.new) Adds a response handler. ex). @@ -1047,7 +1047,7 @@ module Net return sort_internal("UID SORT", sort_keys, search_keys, charset) end - def add_response_handler(handler = Proc.new) + def add_response_handler(handler = Block.new) @response_handlers.push(handler) end diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index b03cbc7a7..89bb8ef04 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -480,6 +480,14 @@ module Net buf = preprocess(c) rest = '' end + else + # Not Telnetmode. + # + # We cannot use preprocess() on this data, because that + # method makes some Telnetmode-specific assumptions. + buf = c + buf.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"] + rest = '' end @log.print(buf) if @options.has_key?("Output_log") line += buf -- cgit