From 9dd98aa46e01544afb84c64d461e5b2360b81eac Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 3 Jul 2000 09:20:35 +0000
Subject: [PATCH] * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26. *
 lib/net/protocol.rb (finish): do nothing unless active. * lib/net/http.rb:
 HTTP#{get,post}2 again (for new impl).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/http.rb     | 13 +++----------
 lib/net/protocol.rb |  7 +++----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/lib/net/http.rb b/lib/net/http.rb
index c5612c8754..5e66f9ddef 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -248,30 +248,23 @@ module Net
 
       undef head
       alias head head2
-      undef head2
 
-      alias old_get2 get2
-      undef get2
       undef get
 
       def get( path, u_header = nil, dest = nil, &block )
-        old_get2( path, u_header ) {|f| f.body( dest, &block ) }
+        get2( path, u_header ) {|f| f.body( dest, &block ) }
       end
 
-      alias old_post2 post2
-      undef post2
       undef post
 
       def post( path, data, u_header = nil, dest = nil, &block )
-        old_post2( path, data, u_header ) {|f| f.body( dest, &block ) }
+        post2( path, data, u_header ) {|f| f.body( dest, &block ) }
       end
 
-      alias old_put2 put2
-      undef put2
       undef put
 
       def put( path, src, u_header = nil )
-        old_put2( path, src, u_header ) {|f| f.body }
+        put2( path, src, u_header ) {|f| f.body }
       end
 
       ^
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index f438a86c77..10bc8b0a14 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -64,7 +64,7 @@ module Net
 
   class Protocol
 
-    Version = '1.1.25'
+    Version = '1.1.26'
 
 
     class << self
@@ -173,13 +173,12 @@ module Net
     end
 
     def finish
-      ret = active?
+      return false unless active?
 
       do_finish
       disconnect
       @active = false
-
-      ret
+      true
     end
 
     def active?