Skip to content

Clean up multi_handles on the same thread #5304

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

Draft
clintonpi wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Draft

Clean up multi_handles on the same thread #5304

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
11 changes: 10 additions & 1 deletion Sources/FoundationNetworking/URLSession/libcurl/MultiHandle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,16 @@ extension URLSession {
easyHandles.forEach {
try! CFURLSessionMultiHandleRemoveHandle(rawHandle, $0.rawHandle).asError()
}
try! CFURLSessionMultiHandleDeinit(rawHandle).asError()

let rawHandleSendable = Int(bitPattern: rawHandle)

// To avoid intermittent crashes due to multi-threading issues in OpenSSL (<1.1.0) when calling curl_multi_cleanup,
// run all curl_multi_cleanup calls on the same thread.
// See https://curl.se/libcurl/c/threadsafe.html.
queue.async {
let rawHandleCopy = UnsafeMutableRawPointer(bitPattern: rawHandleSendable)!
try! CFURLSessionMultiHandleDeinit(rawHandleCopy).asError()
}
}
}
}
Expand Down