Skip to content

Commit aff86d6

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: [skip ci] Fix borked xleak skip on <PHP-8.3
2 parents 936538d + b21df69 commit aff86d6

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

ext/dl_test/tests/skip.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ if (!file_exists($path)) {
1414
}
1515

1616
if (getenv('SKIP_ASAN')) {
17-
die('xleak dl() crashes LSan');
17+
die('skip dl() crashes LSan');
1818
}

ext/opcache/tests/bug68104.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ disable_functions=dl
1010
opcache
1111
--SKIPIF--
1212
<?php
13-
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
13+
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
1414
?>
1515
--FILE--
1616
<?php

ext/standard/tests/general_functions/dl-check-enabled.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
99
if (!in_array(php_sapi_name(), $enabled_sapi)) {
1010
die('skip dl() is not enabled for ' . php_sapi_name());
1111
}
12-
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
12+
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
1313
?>
1414
--INI--
1515
enable_dl=0

ext/standard/tests/general_functions/dl-cve-2007-4887.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
66
if (!in_array(php_sapi_name(), $enabled_sapi)) {
77
die('skip dl() is not enabled for ' . php_sapi_name());
88
}
9-
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
9+
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
1010
?>
1111
--INI--
1212
enable_dl=1

ext/standard/tests/general_functions/dl-full-path-not-supported.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
99
if (!in_array(php_sapi_name(), $enabled_sapi)) {
1010
die('skip dl() is not enabled for ' . php_sapi_name());
1111
}
12-
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
12+
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
1313
?>
1414
--INI--
1515
enable_dl=1

ext/standard/tests/general_functions/gh9589.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dl() segfaults when module is already loaded
44
dl_test
55
--SKIPIF--
66
<?php
7-
if (getenv('SKIP_ASAN')) die('xleak dl() crashes LSan');
7+
if (getenv('SKIP_ASAN')) die('skip dl() crashes LSan');
88
?>
99
--FILE--
1010
<?php

0 commit comments

Comments
 (0)