* lib/net/pop.rb: APOP did not work. [ruby-dev:20149]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · May 4, 2003 · af9bb04 · af9bb04
1 parent 49cd34d
commit af9bb04
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May  4 15:06:37 2003  Minero Aoki  <[email protected]>
+
+	* lib/net/pop.rb: APOP did not work.  [ruby-dev:20149]
+
 Sat May  3 00:58:53 2003  Yukihiro Matsumoto  <[email protected]>
 
 	* class.c (rb_class_protected_instance_methods): now gives

diff --git a/lib/net/pop.rb b/lib/net/pop.rb
@@ -448,7 +448,7 @@ def POP3.auth_only( address, port = nil,
     end
 
     def auth_only( account, password )
-      raise IOError, 'opening already opened POP session' if active?
+      raise IOError, 'opening already opened POP session' if started?
       start(account, password) {
           ;
       }
@@ -511,14 +511,14 @@ def started?
     alias active? started?   # backward compatibility
 
     def start( account, password )
-      raise IOError, 'already closed POP session' if @started
+      raise IOError, 'POP session already started' if @started
 
       if block_given?
         begin
           do_start account, password
           return yield(self)
         ensure
-          finish unless @started
+          finish if @started
         end
       else
         do_start acount, password
@@ -715,12 +715,12 @@ def auth( account, password )
     end
 
     def apop( account, password )
-      raise POPAuthenticationError.new('not APOP server; cannot login', nil)\
+      raise POPAuthenticationError, 'not APOP server; cannot login' \
                                                       unless @apop_stamp
       check_response_auth(critical {
-          get_reply('APOP %s %s',
-                    account,
-                    Digest::MD5.hexdigest(@apop_stamp + password))
+          get_response('APOP %s %s',
+                       account,
+                       Digest::MD5.hexdigest(@apop_stamp + password))
       })
     end
 
@@ -745,7 +745,7 @@ def stat
     end
 
     def rset
-      check_reply(critical { get_response 'RSET' })
+      check_response(critical { get_response 'RSET' })
     end
 
     def top( num, lines = 0, dest = '' )