proper fix for builtin broken http.get

This commit is contained in:
kepler155c@gmail.com 2020-05-28 20:10:01 -06:00
parent a7069f7ea8
commit 7b225a7747
2 changed files with 36 additions and 1 deletions

35
sys/init/1.http.lua Normal file
View File

@ -0,0 +1,35 @@
--[[
FIX for http.get
currently, when 2 requests are generated at same time (diff coroutines) they both
will receive the same file handle. This change will ensure each request gets the
proper response.
--]]
local http = _G.http
local reqs = { }
local function wrapRequest(_url, ...)
local ok, err = http.request(...)
if ok then
while true do
local event, param1, param2, param3 = os.pullEvent()
if event == "http_success"
and param1 == _url
and not reqs[tostring(param2)] then
reqs[tostring(param2)] = true
return param2
elseif event == "http_failure" and param1 == _url then
return nil, param2, param3
end
end
end
return nil, err
end
http.safeGet = function(_url, _headers, _binary)
return wrapRequest(_url, _url, nil, _headers, _binary)
end

View File

@ -536,7 +536,7 @@ end
--[[ loading and running functions ]] --
function Util.httpGet(url, headers, isBinary)
local h, msg = http.get(url, headers, isBinary)
local h, msg = http.safeGet(url, headers, isBinary)
if h then
local contents = h.readAll()
h.close()