Fix socket lifecycle management #5303
Open
+7
−11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Motivation: When an `easy_handle` is added to a `multi_handle`, the callback set for `CURLOPT_CLOSESOCKETFUNCTION` constructs a `_MultiHandle` from an unretained reference to `self`. This could cause a crash in `URLSession` if the `_MultiHandle`'s `self` is deinitialised before the callback is called, and the socket will never be closed. _Partially resolves #3813_ Modifications: - Set the `CURLOPT_CLOSESOCKETFUNCTION` callback to do nothing, deferring closing the socket. - Schedule a socket for closure in the cancellation handler of its dispatch sources. Result: Better management of socket lifecycle. Testing: Passing existing tests is sufficient.
Contributor
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
When an
easy_handleis added to amulti_handle, the callback set forCURLOPT_CLOSESOCKETFUNCTIONconstructs a_MultiHandlefrom an unretained reference toself. This could cause a crash inURLSessionif the_MultiHandle'sselfis deinitialised before the callback is called, and the socket will never be closed.Partially resolves #3813
Modifications:
CURLOPT_CLOSESOCKETFUNCTIONcallback to do nothing, deferring closing the socket.Result:
Better management of socket lifecycle.
Testing:
Passing existing tests is sufficient.