[pull] master from php:master#1044
Merged
Merged
Conversation
The following macros are either defined (to 1) or undefined: * HAVE_CLOCK_GETTIME_NSEC_NP * HAVE_SYS_POLL_H * HAVE_SYS_WAIT_H * HAVE_TZSET * HAVE_WIFCONTINUED
Convert the ext/openssl stream messages to the new stream error API so they honour the context error_mode/store like the other converted streams. All messages emitted while a stream error operation is open must go through the new API, otherwise mixing immediate php_error_docref() with buffered reporting reorders the output. This required emitting "Accept failed" via php_stream_warn() (adding StreamErrorCode::AcceptFailed) and threading a php_stream* through php_openssl_check_path_ex() (NULL for non-stream callers). Fingerprint changes: refactor php_openssl_x509_fingerprint_cmp() into an 'is equal' variant using zend_string; make php_openssl_x509_fingerprint_match() warn on all failure cases to avoid double warnings; thread a php_stream* into php_openssl_x509_fingerprint() so it reports through the operation, and demote its internal "Could not generate signature" failure from E_ERROR to a warning. Co-authored-by: Jakub Zelenka <bukka@php.net>
And clean-up usage sites as some of them shouldn't even be possible in the first place
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )