[stable25] fix(dav): Always respond custom error page on exceptions#48304
Merged
[stable25] fix(dav): Always respond custom error page on exceptions#48304
Conversation
b407afd to
71582d2
Compare
artonge
approved these changes
Sep 24, 2024
71582d2 to
0d488df
Compare
| if (BrowserErrorPagePlugin::isBrowserRequest($request)) { | ||
| $this->server->addPlugin(new BrowserErrorPagePlugin()); | ||
| } | ||
| $this->server->addPlugin(new ErrorPagePlugin($this->request, \OC::$server->getConfig())); |
Check notice
Code scanning / Psalm
DeprecatedMethod
20d9af7 to
c513c09
Compare
| public function logException(\Throwable $ex): void { | ||
| if ($ex instanceof Exception) { | ||
| $httpCode = $ex->getHTTPCode(); | ||
| $headers = $ex->getHTTPHeaders($this->server); |
Check notice
Code scanning / Psalm
PossiblyNullArgument
| $httpCode = 500; | ||
| $headers = []; | ||
| } | ||
| $this->server->httpResponse->addHeaders($headers); |
Check notice
Code scanning / Psalm
PossiblyNullPropertyFetch
| $httpCode = 500; | ||
| $headers = []; | ||
| } | ||
| $this->server->httpResponse->addHeaders($headers); |
Check notice
Code scanning / Psalm
PossiblyNullReference
| } else { | ||
| $templateName = 'xml_exception'; | ||
| $renderAs = null; | ||
| $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8'); |
Check notice
Code scanning / Psalm
PossiblyNullPropertyFetch
| /** | ||
| * @codeCoverageIgnore | ||
| */ | ||
| public function sendResponse() { |
Check notice
Code scanning / Psalm
MissingReturnType
| * @codeCoverageIgnore | ||
| */ | ||
| public function sendResponse() { | ||
| $this->server->sapi->sendResponse($this->server->httpResponse); |
Check notice
Code scanning / Psalm
PossiblyNullPropertyFetch
| * @codeCoverageIgnore | ||
| */ | ||
| public function sendResponse() { | ||
| $this->server->sapi->sendResponse($this->server->httpResponse); |
Check notice
Code scanning / Psalm
PossiblyNullReference
| * @codeCoverageIgnore | ||
| */ | ||
| public function sendResponse() { | ||
| $this->server->sapi->sendResponse($this->server->httpResponse); |
Check notice
Code scanning / Psalm
PossiblyNullPropertyFetch
| * @codeCoverageIgnore | ||
| */ | ||
| public function sendResponse() { | ||
| $this->server->sapi->sendResponse($this->server->httpResponse); |
Check notice
Code scanning / Psalm
PossiblyNullArgument
c513c09 to
8c3e687
Compare
provokateurin
approved these changes
Sep 25, 2024
8c3e687 to
972fcb2
Compare
come-nc
approved these changes
Sep 26, 2024
d8e966a to
a7d821d
Compare
Signed-off-by: Louis Chemineau <[email protected]>
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]>
…utput Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
15b695d to
fc6ab73
Compare
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Backport of #48297
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.