Skip to content

Stop the grace timer iff adding first handle (fix #99) #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2021
Merged

Stop the grace timer iff adding first handle (fix #99) #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
841ac8f
Stop the grace timer iff adding first handle (fix #99)
StefanKarpinski Feb 25, 2021
e6fa856
Test for #99 from Tim's PR
maleadt Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Curl/Multi.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mutable struct Multi
end

function init!(multi::Multi)
uv_timer_stop(multi.timer)
multi.handle != C_NULL && return
multi.handle = curl_multi_init()
add_callbacks(multi)
set_defaults(multi)
Expand All @@ -42,9 +42,12 @@ end

function add_handle(multi::Multi, easy::Easy)
lock(multi.lock) do
isempty(multi.easies) && preserve_handle(multi)
multi.handle == C_NULL && init!(multi)
if isempty(multi.easies)
preserve_handle(multi)
uv_timer_stop(multi.timer) # stop grace timer
end
push!(multi.easies, easy)
init!(multi)
@check curl_multi_add_handle(multi.handle, easy.handle)
end
end
Expand Down
6 changes: 6 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,12 @@ include("setup.jl")
head = String(read!(open(file), Vector{UInt8}(undef, 16)))
@test head == "\x1f\x8b\b\0\xa5T.\\\x02\x03\xec]{s۶"
end

@testset "grace cleanup" begin
dl = Downloader(grace=1)
Downloads.download("https://httpbingo.org/drip"; downloader=dl)
Downloads.download("https://httpbingo.org/drip"; downloader=dl)
end
end

Downloads.DOWNLOADER[] = nothing
Expand Down