summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-21 06:37:24 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-21 06:37:24 +0000
commit13243e5ad15f5d0d259b4850199183fdf9572f46 (patch)
treeac85733cc87fdfccc5b1e1e0b20aae1de610cf5a /lib
parentfc57cd59ffe2cca34d6bd48962f0be47eed0f509 (diff)
matz - net library bug (by me)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/http.rb4
-rw-r--r--lib/thwait.rb2
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 65cd5a9..447e88c 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -350,13 +350,11 @@ module Net
@socket.reopen
end
- yield( u_header )
+ resp = yield( u_header )
if ublock then
adapter = HTTPReadAdapter.new( @command )
ublock.call adapter
resp = adapter.off
- else
- resp = @command.get_response
end
unless keep_alive? u_header, resp then
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 8003f0d..3c17009 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -96,7 +96,7 @@ class ThreadsWait
# adds thread(s) to join, no wait.
def join_nowait(*threads)
- @threads.concat threads
+ @threads.concat threads.flatten
for th in threads
Thread.start do
th = th.join