Merge branch 'PHP-7.4'

nikic · nikic · commit 85c8c5bfaccc · 2019-10-11T10:58:03.000+02:00
diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -14,7 +14,7 @@ try {
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
-$s = stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND);
+$s = stream_socket_server("udp://127.0.0.1:58394", $errno, $errstr, STREAM_SERVER_BIND);
 var_dump($s);
 var_dump(fclose($s));
 try {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ try {`
`14`	`14`	`} catch (TypeError $e) {`
`15`	`15`	`echo $e->getMessage(), "\n";`
`16`	`16`	`}`
`17`		`-$s = stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND);`
	`17`	`+$s = stream_socket_server("udp://127.0.0.1:58394", $errno, $errstr, STREAM_SERVER_BIND);`
`18`	`18`	`var_dump($s);`
`19`	`19`	`var_dump(fclose($s));`
`20`	`20`	`try {`