Skip to content

Commit 5dd8bb0

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: ext/curl: mark certain tests as xfail on curl 8.10.0
2 parents b2eff1f + 8b35b06 commit 5dd8bb0

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

ext/curl/tests/bug48203_multi.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Variation of bug #48203 with curl_multi_exec (Crash when file pointers passed to
44
curl
55
--SKIPIF--
66
<?php
7-
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
8-
die("xfail Test fails for unknown reasons");
7+
if (curl_version()['version_number'] === 0x080a00) {
8+
// https://github.com/php/php-src/issues/15997
9+
die('xfail due to a libcurl bug');
910
}
1011
?>
1112
--FILE--

ext/curl/tests/bug71523.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_
44
curl
55
--SKIPIF--
66
<?php
7-
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
8-
die("xfail Test fails for unknown reasons");
7+
if (curl_version()['version_number'] === 0x080a00) {
8+
// https://github.com/php/php-src/issues/15997
9+
die('xfail due to a libcurl bug');
910
}
1011
?>
1112
--FILE--

ext/curl/tests/curl_basic_018.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ TestFest 2009 - AFUP - Thomas Rabaix <[email protected]>
66
curl
77
--SKIPIF--
88
<?php
9-
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
10-
die("xfail Test fails for unknown reasons");
9+
if (curl_version()['version_number'] === 0x080a00) {
10+
// https://github.com/php/php-src/issues/15997
11+
die('xfail due to a libcurl bug');
1112
}
1213
?>
1314
--FILE--

ext/curl/tests/curl_multi_getcontent_basic3.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Rein Velt ([email protected])
77
curl
88
--SKIPIF--
99
<?php
10-
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
11-
die("xfail Test fails for unknown reasons");
10+
if (curl_version()['version_number'] === 0x080a00) {
11+
// https://github.com/php/php-src/issues/15997
12+
die('xfail due to a libcurl bug');
1213
}
1314
?>
1415
--FILE--

0 commit comments

Comments
 (0)