Fixes a CFNetwork runtime warning #191
Merged
Conversation
This file contains 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
jszumski
commented
Oct 6, 2023
| - (NSData *)swz_HTTPBody | ||
| { | ||
| // upload tasks will trigger a runtime warning if their body is non-nil, see note above | ||
| if ([self sbt_isUploadTaskRequest]) { | ||
| return nil; |
There was a problem hiding this comment.
This is where the actual warning is avoided
| if (![matcher matches:requestBody]) { | ||
|
|
||
| // an upload task previously stored its body contents in NSURLProtocol to avoid a CFNetwork runtime warning | ||
| NSData *body = ([request sbt_isUploadTaskRequest]) ? [request sbt_uploadHTTPBody] : request.HTTPBody; |
There was a problem hiding this comment.
This is where we fetch the original body differently for upload tasks
tcamin
reviewed
Oct 7, 2023
|
|
||
| NSString * const SBTUITunneledNSURLProtocolIsUploadTaskKey = @"SBTUITunneledNSURLProtocolIsUploadTaskKey"; | ||
|
|
||
| - (NSData *)sbt_uploadHTTPBody |
There was a problem hiding this comment.
Could you add a test that covers these changes?
…ontains an HTTP body.
jszumski
force-pushed
the
cfnetwork-warning
branch
from
10f0835
to
c191099
Compare
tcamin
approved these changes
Oct 11, 2023
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.
Work towards #186.
In Xcode 15+ CFNetwork emits a runtime warning when an upload task contains a body:
To work around this, we keep track of requests originating from upload tasks with the existing swizzling in
NSURLSession+HTTPBodyFix. For those tasks, we save the original body via NSURLProtocol and remove it from the request to avoid the warning.When using a request body (e.g., when matching stubs), previously marked upload requests must exclusively reference the copy from NSURLProtocol because the request's
HTTPBodywas cleared.