Skip to content

Commit 7e3a6a1

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: ext/curl: Fix failing tests due to string changes in libcurl 8.6.0
2 parents d65c395 + 4048035 commit 7e3a6a1

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.3.4
44

5+
- Curl:
6+
. Fix failing tests due to string changes in libcurl 8.6.0. (Ayesh)
7+
58
- Standard:
69
. Fixed bug GH-13279 (Instable array during in-place modification in uksort).
710
(ilutov)

ext/curl/tests/bug77946.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ curl_multi_close($mh);
3434
--EXPECTF--
3535
int(1)
3636
int(1)
37-
string(%d) "Protocol %Sunknown%S not supported or disabled in libcurl"
37+
string(%d) "Protocol %Sunknown%S %rnot supported( or disabled in libcurl)?%r"

0 commit comments

Comments
 (0)