diff options
| -rw-r--r-- | lib/net/http.rb | 13 | ||||
| -rw-r--r-- | 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? |