Skip to content
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

Do not throw exception on xinclude with fallbacks #7324

Merged
merged 1 commit into from Jan 7, 2022

Conversation

vstm
Copy link
Contributor

@vstm vstm commented Jan 6, 2022

This will fix issue #7243, it will suppress all warnings emited by xinclude (they will not be converted to exceptions via ErrorHandler). Errors during xinclude will still be converted to exceptions (for example if there is an invalid xinclude without fallback).

I branched from master - is that still ok, because I've seend there's a new 4.x branch? I can rebase to that if needed.

Fixes #7243

@weirdan
Copy link
Collaborator

weirdan commented Jan 7, 2022

I branched from master - is that still ok, because I've seend there's a new 4.x branch? I can rebase to that if needed.

Please do. master is now receiving BC breaking changes, and this one is still compatible with the 4.x line.

@weirdan weirdan added the release:fix The PR will be included in 'Fixes' section of the release notes label Jan 7, 2022
@vstm vstm force-pushed the fix-xinclude-missing-files branch from 4193531 to 7f2f0d9 Compare January 7, 2022 09:19
@weirdan weirdan changed the base branch from master to 4.x January 7, 2022 09:27
@weirdan weirdan merged commit 4080b03 into vimeo:4.x Jan 7, 2022
@weirdan
Copy link
Collaborator

weirdan commented Jan 7, 2022

Thanks!

@weirdan weirdan changed the title Issue #7243: Do not throw exception on xinclude with fallbacks Do not throw exception on xinclude with fallbacks Jan 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release:fix The PR will be included in 'Fixes' section of the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

xi:fallback does not work
2 participants