Merge branch 'PHP-8.4' into PHP-8.5

TimWolla · TimWolla · commit 34f8bc824c65 · 2026-06-23T12:10:15.000+02:00
* PHP-8.4: ext/sockets/tests/gh21161.phpt: skip if no ipv6 (#22403)
diff --git a/ext/sockets/tests/gh21161.phpt b/ext/sockets/tests/gh21161.phpt
@@ -7,6 +7,7 @@ sockets
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }
+require 'ipv6_skipif.inc';
 ?>
 --FILE--
 <?php

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ sockets`
`7`	`7`	`if (substr(PHP_OS, 0, 3) == 'WIN') {`
`8`	`8`	`die('skip.. Not valid for Windows');`
`9`	`9`	`}`
	`10`	`+require 'ipv6_skipif.inc';`
`10`	`11`	`?>`
`11`	`12`	`--FILE--`
`12`	`13`	`<?php`