Repository navigation
fix(mac): wait for the proxy upload task to finish - #176
Merged
Merged
Conversation
Since getsentry#111, ExecuteProxyRequest stops waiting after 10 seconds, while the task can still read the caller's body stream and write `response_body`. A slow upload through a proxy also fails, although the server may still accept it. The session is never invalidated, so it leaks on every upload. Wait for the completion handler and invalidate the session afterwards, as upstream does since 7704559 ("mac: Migrate HTTPTransportMac to NSURLSession"). The request's timeout still ends a stalled upload.
jpnurmi
approved these changes
Oct 19, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since #111,
ExecuteProxyRequestwaits at most 10 seconds for the upload task. When that wait times out:body_stream()and later writesync_rvand*response_body(described in fix: proxy-upload semaphore_wait timeout #111 (comment));This change waits for the completion handler and then calls
finishTasksAndInvalidate, as upstream does since 7704559 ("mac: Migrate HTTPTransportMac to NSURLSession", review). As there, the request'stimeoutInterval(timeout()) still ends a stalled upload. If the task cannot be created, the session is invalidated before returning.Syncing all of 7704559 would also fix this. This PR changes only the proxy path.
Related: #175 and getsentry/sentry-native#2218 make an empty proxy use this path on macOS.