From 587d68c5130389527e4309ad4e68726e3fe3792d Mon Sep 17 00:00:00 2001 From: aamine Date: Sun, 4 May 2003 06:18:19 +0000 Subject: * lib/net/smtp.rb: ESMTP -> SMTP transition wrongly fails. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/net/smtp.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15e4c9c17..133ce5302 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun May 4 15:21:18 2003 Minero Aoki + + * lib/net/smtp.rb: ESMTP -> SMTP transition wrongly fails. + Sun May 4 15:06:37 2003 Minero Aoki * lib/net/pop.rb: APOP did not work. [ruby-dev:20149] diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index 276c979b2..71d368e08 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -302,7 +302,7 @@ module Net def start( helo = 'localhost.localdomain', user = nil, secret = nil, authtype = nil ) - raise IOError, 'SMTP session opened already' if @started + raise IOError, 'SMTP session already started' if @started if block_given? begin do_start(helo, user, secret, authtype) @@ -330,7 +330,7 @@ module Net rescue ProtocolError if @esmtp @esmtp = false - @command.error_ok + @command = SMTPCommand.new(@socket) retry end raise -- cgit