summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-04 06:18:19 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-04 06:18:19 +0000
commit587d68c5130389527e4309ad4e68726e3fe3792d (patch)
treef6321b2df628ffb13644e23ca6d710642e0211f9
parent5c44a03186fa855669f2f6be003bdd825bafffc4 (diff)
downloadruby-587d68c5130389527e4309ad4e68726e3fe3792d.tar.gz
ruby-587d68c5130389527e4309ad4e68726e3fe3792d.tar.xz
ruby-587d68c5130389527e4309ad4e68726e3fe3792d.zip
* 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
-rw-r--r--ChangeLog4
-rw-r--r--lib/net/smtp.rb4
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 <aamine@loveruby.net>
+
+ * lib/net/smtp.rb: ESMTP -> SMTP transition wrongly fails.
+
Sun May 4 15:06:37 2003 Minero Aoki <aamine@loveruby.net>
* 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