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.

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

PHP: Handle request errors in PHPRequestHandler, return response code 500 #1249

Merged
merged 10 commits into from
Apr 17, 2024
Merged

PHP: Handle request errors in PHPRequestHandler, return response code 500 #1249

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a3be7c
Fix: handle request error gracefully
kozer Apr 16, 2024
ea5888f
Merge branch 'trunk' into fix/handle_request_error_gracefully
kozer Apr 16, 2024
33c36cb
Update: Create interface for better type handling
kozer Apr 16, 2024
8eb5446
Update: In case of non zero exit code, mark response as 500
kozer Apr 16, 2024
1d381fb
Merge branch 'trunk' into fix/handle_request_error_gracefully
kozer Apr 16, 2024
bf23b2c
Merge branch 'trunk' into fix/handle_request_error_gracefully
kozer Apr 17, 2024
10016d8
Update: Add tests
kozer Apr 17, 2024
6f69028
Merge branch 'trunk' into fix/handle_request_error_gracefully
kozer Apr 17, 2024
1b3383a
adjust the test example
adamziel Apr 17, 2024
a1c906b
Make PHPExecutionFailureError a class, remove an extra error handler …
adamziel Apr 17, 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
32 changes: 21 additions & 11 deletions packages/php-wasm/universal/src/lib/php-request-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,17 +242,27 @@ export class PHPRequestHandler implements RequestHandler {
);
}

return await this.php.run({
relativeUri: ensurePathPrefix(
toRelativeUrl(requestedUrl),
this.#PATHNAME
),
protocol: this.#PROTOCOL,
method: request.method || preferredMethod,
body,
scriptPath,
headers,
});
try {
return await this.php.run({
relativeUri: ensurePathPrefix(
toRelativeUrl(requestedUrl),
this.#PATHNAME
),
protocol: this.#PROTOCOL,
method: request.method || preferredMethod,
body,
scriptPath,
headers,
});
} catch (error) {
return (
error as {
message: string;
response: PHPResponse;
source: string;
}
kozer marked this conversation as resolved.
Show resolved Hide resolved
).response;
}
} finally {
release();
}
Expand Down
Loading