Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  [skip ci] Fix borked xleak skip on <PHP-8.3
This commit is contained in:
Ilija Tovilo committed 2023-09-01 12:40:07 +02:00
commit aff86d68f6
6 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -14,5 +14,5 @@ if (!file_exists($path)) {
}
if (getenv('SKIP_ASAN')) {
die('xleak dl() crashes LSan');
die('skip dl() crashes LSan');
}
+1 -1
View File
@@ -10,7 +10,7 @@ disable_functions=dl
opcache
--SKIPIF--
<?php
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
?>
--FILE--
<?php
@@ -9,7 +9,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
if (!in_array(php_sapi_name(), $enabled_sapi)) {
die('skip dl() is not enabled for ' . php_sapi_name());
}
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
?>
--INI--
enable_dl=0
@@ -6,7 +6,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
if (!in_array(php_sapi_name(), $enabled_sapi)) {
die('skip dl() is not enabled for ' . php_sapi_name());
}
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
?>
--INI--
enable_dl=1
@@ -9,7 +9,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
if (!in_array(php_sapi_name(), $enabled_sapi)) {
die('skip dl() is not enabled for ' . php_sapi_name());
}
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
?>
--INI--
enable_dl=1
@@ -4,7 +4,7 @@ dl() segfaults when module is already loaded
dl_test
--SKIPIF--
<?php
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
?>
--FILE--
<?php