summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-13 21:20:41 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-07-13 21:20:41 +0000
commita2193f50e80823d34e3d283effb2b4539c15b6f2 (patch)
tree8e10eaaa7454f9bb0ee99794a987d8a2b1ba6124
parent76d7dae26ab8b56dbafcec710fc42a5fb7d79840 (diff)
aamine
* lib/net/http.rb: HTTP#proxy? did not worked. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/net/http.rb4
-rw-r--r--lib/net/protocol.rb2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cd130eb2f0..20f97fb3980 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 14 06:20:17 2001 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb: HTTP#proxy? did not worked.
+
Sat Jul 14 02:56:19 2001 Akinori MUSHA <knu@iDaemons.org>
* ext/extmk.rb.in: support multi-level ext/ directories.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index f2b6635fd44..f96859be1e9 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 edc0f24b6e6..5835c136bf3 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