[pull] master from php:master #1144
Merged
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
This fixes incorrect type conversion and subsequent check for Windows where returned socket is not an int. It should be noted that this is not really an issue as previous int would get negative so the check should still work. The issue actually happens only in master (PHP 8.5) where refactoring has been done and the type changed. Closes GH-19881
* PHP-8.3: Fix GH-19798: XP_SOCKET XP_SSL: Incorrect condition for Win
* PHP-8.4: Fix GH-19798: XP_SOCKET XP_SSL: Incorrect condition for Win
* PHP-8.5: Fix GH-19798: XP_SOCKET XP_SSL: Incorrect condition for Win
The FIELD_TYPE constants are for BC. The JSON/VECTOR types are not defined in FIELD_TYPE for libmysqlclient. MYSQL_TYPE is available since MYSQL 5.0.0, so switch to that. Since MYSQL_TYPEs are enums and not defines, we need version checks instead. JSON was added in mysql 8.0.0 in mysql/mysql-server@c24045514581 JSON support was backported via mysql/mysql-server@3e14f9f in 5.7.8. VECTOR was added in mysql 9.0.0 in mysql/mysql-server@8cd51511de7d Replaces GH-20245.
* PHP-8.3: Use MYSQL_TYPE constants instead of FIELD_TYPE
* PHP-8.4: Use MYSQL_TYPE constants instead of FIELD_TYPE
* PHP-8.5: Use MYSQL_TYPE constants instead of FIELD_TYPE
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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 : )