Skip to content

Fix GH-24787 delayed OOM during request startup #25168

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

Draft
kairosci wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −0
Draft

Fix GH-24787 delayed OOM during request startup #25168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,6 +1922,9 @@ zend_result php_request_startup(void)
/* PG(during_request_startup) = 0; */

php_hash_environment();
if (ZEND_HAS_OOM()) {
zend_handle_delayed_oom();
}
zend_activate_modules();
PG(modules_activated)=1;
} zend_catch {
Expand Down
38 changes: 38 additions & 0 deletions tests/basic/gh24787_delayed_oom_request_startup.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--TEST--
GH-24787 (Delayed OOM during request startup is handled as a fatal error)
--SKIPIF--
<?php
if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
die('skip php-cgi not available');
}
if (!extension_loaded('uri')) {
die('skip uri extension not available');
}
?>
--FILE--
<?php
$script = tempnam(sys_get_temp_dir(), 'gh24787');
file_put_contents($script, "<?php echo \"request completed\\n\";");

$cookies = [];
for ($i = 0; $i < 5000; $i++) {
$cookies[] = "cookie$i=value";
}

$process = proc_open(
[getenv('TEST_PHP_CGI_EXECUTABLE'), '-n', '-d', 'memory_limit=8M', '-d', 'max_input_vars=10000', '-d', 'html_errors=0'],
[STDIN, ['pipe', 'w'], ['pipe', 'w']],
$pipes,
null,
['REQUEST_METHOD' => 'GET', 'HTTP_COOKIE' => implode('; ', $cookies), 'SCRIPT_FILENAME' => $script, 'REDIRECT_STATUS' => '1']
);
$output = stream_get_contents($pipes[1]) . stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
proc_close($process);
unlink($script);

echo str_contains($output, 'Allowed memory size') ? "OOM handled\n" : $output;
?>
--EXPECT--
OOM handled
Loading