Backport libxml 2.12-2.13 fixes to PHP 8.1 #16381
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
nielsdos
changed the title
nielsdos
force-pushed
the
backport-lxml
branch
from
96a52f1 to
40e15c6
Compare
In master I use ZEND_DIAGNOSTIC_IGNORED_START, but that doesn't exist on 8.2 or 8.3 (8.3 has a similar macro though). So to unbreak CI I just made a variation of this directly in the php_libxml.h header. See php@683e787#commitcomment-134301083
…r change See https://gitlab.gnome.org/GNOME/libxml2/-/issues/753. The base directory for the entity is no longer set, follow the upstream behaviour.
External entity loading got its error level decreased in upstream, which means they now map to E_NOTICE. Also the error message format has changed.
|
And it's about to get a bit more finicky as |
nielsdos
force-pushed
the
backport-lxml
branch
2 times, most recently
from
dce3c10 to
263015a
Compare
Normally I would backport 3354cc6, but this doesn't apply cleanly due to observer changes.
|
@cmb69 @bukka @ramsey This fixes the build failures and test failures related to the libxml stuff. This is quite a heavy backport with only a few changes in the C code (some I made specifically for 8.1 because backports weren't possible), and most changes are in creating alterative phpt test files. Most of these changes have been in PHP 8.2+ since early this year or since July, without reported issues. |
bukka
approved these changes
Oct 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.