Skip to content

[stable26] fix(dav): Always respond custom error page on exceptions #48303

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.

Sign up for GitHub

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

Merged
sorbaugh merged 5 commits into from
Oct 1, 2024
Merged

[stable26] fix(dav): Always respond custom error page on exceptions #48303

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce9be3d
fix(dav): Always respond custom error page on exceptions
artonge Sep 5, 2024
8a4394b
fix: Replace conflicting tags in `xml_exception` template
susnux Sep 6, 2024
e20eaa3
fix: Drop unnecessary exit
artonge Sep 17, 2024
75d7537
fix: Override start method of \Sabre\DAV\Server to remove exception o…
artonge Sep 18, 2024
2a10014
fix: Prevent duplicate creation of print_exception function
artonge Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Replace conflicting tags in xml_exception template 
The `<?xml` tag is interpreted as PHP short tags, so this causes errors.
Instead just print that part of the template.

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @artonge
susnux authored and artonge committed Oct 1, 2024
commit 8a4394bfd875f1a7d3bb7601dfd422471af7704c
2 changes: 1 addition & 1 deletion core/templates/xml_exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ function print_exception(Throwable $e, \OCP\IL10N $l): void {
}
}

print_unescaped('<?xml version="1.0" encoding="utf-8"?>' . "\n");
?>
<?xml version="1.0" encoding="utf-8"?>
<d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
<s:exception><?php p($l->t('Internal Server Error')) ?></s:exception>
<s:message>
Expand Down