镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions server/php-runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ void PhpScript::init(script_t *script, php_query_data_t *data_to_set) noexcept {
state = run_state_t::ready;

error_message = "??? error";
error_type = script_error_t::no_error;

script_time = 0;
net_time = 0;
Expand Down
5 changes: 5 additions & 0 deletions tests/python/tests/http_server/test_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,15 @@ def test_script_errors(self):
"Critical error during script execution: php assert error"
])

response = self.web_server.http_get("/pid")
self.assertEqual(200, response.status_code)

self.web_server.assert_stats(
timeout=5,
initial_stats=stats_before,
expected_added_stats={
# Successful requests must not inherit the preceding script error.
"kphp_server.workers_general_errors_php_assert": 5,
# ensure shared data is not leaked
"kphp_server.server_workers_strange_dead": 0,
"kphp_server.server_workers_killed": 0,
Expand Down
Loading