forked from swiftlang/swift-corelibs-foundation
-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
Fix conflict #1
Open
zunda-pixel
wants to merge
247
commits into
labapart:added-support-for-client-certificate-authentication
Choose a base branch
from
zunda-pixel:fix-pr-conflict
base: added-support-for-client-certificate-authentication
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix conflict #1
zunda-pixel
wants to merge
247
commits into
labapart:added-support-for-client-certificate-authentication
from
zunda-pixel:fix-pr-conflict
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
CURL documentation (https://curl.se/libcurl/c/CURLMOPT_TIMERFUNCTION.html) explicitly says that the timer should be one-time. We basically have to follow CURL requests for setting, resetting and disarming such timers. Current logic eventually leaves a 1ms repeating timer forever, because CURL assumes it fires once, and may not ask us to remove it explicitly. Also, being used as request timeout trigger, this timer also has no sense to be repeated.
Extends socket lifetime enough to let DispatchSource cancel properly. Also prevents from creating new DispatchSources while other are in the middle of cancelling. Also includes tests (see swiftlang#4854 for test details).
…with the toolchain, by renaming the module
…iftlang#4872) From Clang 15, nested static initializer inside statement-expression is no longer a constant-time expression (See https://reviews.llvm.org/D127201). OSS Foundation defines `CFSTR` as a macro rather than `__builtin___CFStringMakeConstantString` and it uses nested static initializer inside statement-expression, so we can't assume `CFSTR` itself is always a constant-time expression. This patch removes some `static` qualifiers associated with `CFSTR` to make them acceptable with Clang 15 and later.
The windows host builds with the old driver for now, so it doesn't yet support wmo
Add android support, that uses new swift-foundation for Android
[FreeBSD] Fix FreeBSD build
[android] Use Bionic imports instead where possible
OpenBSD, as the comment string in _CFPosixSpawnFileActionsChdir says, doesn't have posix_spawn_file_actions_addchdir. Therefore, don't link against it; just return ENOSYS like other similarly situated platforms do.
…e calendar identifiers (swiftlang#5169)
Co-authored-by: Johannes Weiss <[email protected]>
This is required as while `posix_spawnattr_init` permits a nullable type, `posix_spawnattr_setflags` properly expects a non-null parameter. Unwrap the newly minted spawnattr or abort if the allocation failed.
There is no early swift-driver build for the Windows toolchain. As a result, swift-collections fails to build properly when CMP0157 is set to NEW due to object files not being generated. This sets CMP0157 to OLD when targetting Android until the early swift-driver is available on Windows.
Process: unwrap the `posix_spawnattr_t` on Android
The SPI declaration for `libdispatch_init` was not attribtued properly. The result of this omission was an improper reference to the function on Windows when disaptch is _not_ linked statically. Correct the declaration by re-using the `DISPATCH_EXPORT` macro to decorate the declaration with the appropriate DLLStorage as necessary. This was caught by running the Foundation tests with SPM with a refactoring of the toolchain layout during the build.
…157-android Set CMP0157 to OLD for Android on when building with the Windows toolchain
…wiftlang#5159) - move all LIBCURL_VERSION_MAJOR checks into CFURLSessionInterface.c - modify EasyHandle.swift to use the byproducts of libcurl version checks
* Deprecate cString on non-Darwin (swiftlang#3885) * Address review feedback * Undeprecate one version of the API, which can be implemented correctly
…tate (swiftlang#5192) The refactoring in swiftlang#5160 moved a comment around such that it appeared as if QNX supports this function - it does not. Clarify the situation.
# Conflicts: # CoreFoundation/CMakeLists.txt # Sources/FoundationNetworking/CMakeLists.txt # Sources/FoundationNetworking/URLCredential.swift # Sources/FoundationNetworking/URLSession/URLSessionConfiguration.swift # Sources/_CFURLSessionInterface/CFURLSessionInterface.c # Sources/_CFURLSessionInterface/include/CFURLSessionInterface.h
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.
I created pr to fix conflict swiftlang#4937
git merge swiftlang/swift-corelibs-foundation#main