Merge pull request #6 from bluesmoon/remove_handle

Add tests and fix bugs in curl_multi_remove_handle method definition.
bluesmoon · Oct 11, 2023 · 1443a49 · 1443a49
2 parents e42b56f + 0b4e87c
commit 1443a49
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/CurlHTTP.jl b/src/CurlHTTP.jl
@@ -395,7 +395,7 @@ function LibCURL.curl_multi_perform(curl::CurlMulti)
     numfds = Ref{Cint}()
 
     while still_running[] > 0
-        mc = curl_multi_perform(curl.handle, still_running)
+        mc = curl_multi_perform(curl, still_running)
 
         if mc == CURLM_OK
             mc = curl_multi_wait(curl.handle, C_NULL, 0, 1000, numfds)
@@ -434,16 +434,16 @@ function LibCURL.curl_multi_remove_handle(multi::CurlMulti, easy::CurlEasy)
     filter!(pool_entry -> pool_entry.uuid != easy.uuid, multi.pool)
     curl_multi_remove_handle(multi.handle, easy.handle)
 end
-function LibCURL.curl_multi_remove_handle(multi::CurlMulti, easy_uuid::AbstractString)
+LibCURL.curl_multi_remove_handle(multi::CurlMulti, easy_uuid::AbstractString) = curl_multi_remove_handle(multi, Base.UUID(easy_uuid))
+function LibCURL.curl_multi_remove_handle(multi::CurlMulti, easy_uuid::Base.UUID)
     easy = findfirst(pool_entry -> pool_entry.uuid == easy_uuid, multi.pool)
     if isnothing(easy)
         return nothing
     end
 
     easy = multi.pool[easy]
 
-    filter!(pool_entry -> pool_entry.uuid != easy_uuid, multi.pool)
-    curl_multi_remove_handle(multi.handle, easy.handle)
+    curl_multi_remove_handle(multi, easy)
 end
 
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -297,7 +297,8 @@ function test_multi_writeCB()
     @test CURLM_OK == res
     @test 3 == length(responses)
 
-    @testset "Response $(r[:i])" for r in responses
+    @testset "Response $(p.userdata[:i])" for p in curl.pool
+        r = p.userdata
         @test haskey(r, :http_status)
         @test r[:http_status] == 200
 
@@ -309,7 +310,10 @@ function test_multi_writeCB()
 
         @test haskey(r, :errormessage)
         @test "" == r[:errormessage]
+
+        @test CURLM_OK == curl_multi_remove_handle(curl, p.uuid)
     end
+    @test nothing == curl_multi_remove_handle(curl, CurlHTTP.UUIDs.uuid4())
 end
 
 function test_Certs()