summaryrefslogtreecommitdiff
path: root/lib/net
diff options
context:
space:
mode:
Diffstat (limited to 'lib/net')
-rw-r--r--lib/net/http.rb4
-rw-r--r--lib/net/protocol.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb
index f2b6635fd4..f96859be1e 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -517,7 +517,7 @@ module Net
end
def proxy?
- type.proxy?
+ type.proxy_class?
end
def proxy_address
@@ -543,7 +543,7 @@ module Net
klass = Class.new( HTTP )
klass.module_eval {
include mod
- @is_proxy = true
+ @is_proxy_class = true
@proxy_address = p_addr
@proxy_port = p_port
}
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index edc0f24b6e..5835c136bf 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -129,7 +129,7 @@ module Net
_start args
yield self
ensure
- finish
+ finish if active?
end
else
_start args