Skip to content
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

fix cancelling upload requests #259

Merged
merged 1 commit into from
Sep 9, 2024
Merged

fix cancelling upload requests #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/Curl/Easy.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,11 @@ function upload_data(easy::Easy, input::IO)
curl_easy_pause(easy.handle, Curl.CURLPAUSE_CONT)
wait(easy.ready)
easy.input === nothing && break
easy.ready = Threads.Event()
if hasmethod(reset, (Base.Event,))
reset(easy.ready)
else
easy.ready = Threads.Event()
end
end
end

Expand Down
8 changes: 5 additions & 3 deletions src/Downloads.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ function request(

# do the request
add_handle(downloader.multi, easy)
interrupted = false
interrupted = Threads.Atomic{Bool}(false)
if interrupt !== nothing
interrupt_task = @async begin
# wait for the interrupt event
Expand All @@ -405,7 +405,9 @@ function request(
remove_handle(downloader.multi, easy)
close(easy.output)
close(easy.progress)
interrupted = true
interrupted[] = true
close(input)
notify(easy.ready)
end
else
interrupt_task = nothing
Expand All @@ -425,7 +427,7 @@ function request(
end
end
finally
if !interrupted
if !(interrupted[])
if interrupt_task !== nothing
# trigger interrupt
notify(interrupt)
Expand Down
11 changes: 11 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,17 @@ include("setup.jl")
timedwait(()->istaskdone(download_task), 5.0)
@test istaskdone(download_task)
@test download_task.result isa RequestError

interrupt = Base.Event()
url = "$server/put"
input=`sh -c 'sleep 15; echo "hello"'`
download_task = @async request(url; interrupt=interrupt, input=input)
sleep(0.1)
@test !istaskdone(download_task)
notify(interrupt)
timedwait(()->istaskdone(download_task), 5.0)
@test istaskdone(download_task)
@test download_task.result isa RequestError
end

@testset "progress" begin
Expand Down
Loading