Fix. multi:info_read correctly remove easy handle.

master
Alexey Melnichuk 2014-09-11 14:39:24 +05:00
parent b2e6bcae4e
commit 1b88ec42b8
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,35 @@
local cURL = require("cURL")
local f1 = io.open("lua.html", "w+b")
local f2 = io.open("luajit.html", "w+b")
-- setup easy and url
c1 = cURL.easy{url = "http://www.lua.org/", writefunction = f1}
c2 = cURL.easy{url = "http://luajit.org/", writefunction = f2}
c3 = cURL.easy{url = "****://luajit.org/"} -- UNSUPPORTED_PROTOCOL
m = cURL.multi()
:add_handle(c1)
:add_handle(c2)
:add_handle(c3)
local remain = 3
while remain > 0 do
local last = m:perform() -- do some work
if last < remain then -- we have done some tasks
while true do -- proceed results/errors
local e, ok, err = m:info_read(true) -- get result and remove handle
if e == 0 then break end -- no more finished tasks
if ok then -- succeed
print(e:getinfo_effective_url(), '-', e:getinfo_response_code())
else -- failure
print(e:getinfo_effective_url(), '-', err)
end
e:close()
end
end
remain = last
-- wait while libcurl do io select
m:wait()
end

View File

@ -393,7 +393,16 @@ function Multi:remove_handle(e)
return remove_handle(self, h)
end
--! @fixme Multi:info_read(true) should also remove easy handle from self._easy
function Multi:info_read(...)
local h, ok, err = self:handle():info_read(...)
if not h then return nil, ok end
if h == 0 then return h end
if ... and self._easy[h] then
self._easy[h], self._easy.n = nil, self._easy.n - 1
end
return h, ok, err
end
end
-------------------------------------------