Merge branch 'PHP-8.1' into PHP-8.2

Author: devnexen

NEWS

@@ -36,6 +36,10 @@ PHP                                                                        NEWS
     foreach). (nielsdos)
   . Fixed bug #55098 (SimpleXML iteration produces infinite loop). (nielsdos)
 
+- Streams:
+  . Fixed bug GH-12190 (binding ipv4 address with both address and port at 0).
+    (David Carlier)
+
 - XML:
   . Fix return type of stub of xml_parse_into_struct(). (nielsdos)
   . Fix memory leak when calling xml_parse_into_struct() twice. (nielsdos)

ext/standard/tests/network/gh12190.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Bug #12190 (Setting 0 with port 0 too)
+--SKIPIF--
+<?php
+if (getenv("SKIP_ONLINE_TESTS")) die('skip online test');
+if (!in_array('https', stream_get_wrappers())) die('skip: https wrapper is required');
+?>
+--FILE--
+<?php
+$context = stream_context_create(['socket' => ['bindto' => '0:0']]);
+var_dump(file_get_contents('https://httpbin.org/get', false, $context) !== false);
+?>
+--EXPECT--
+bool(true)

main/network.c

@@ -835,8 +835,8 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
 			case AF_INET:
 				((struct sockaddr_in *)sa)->sin_port = htons(port);
 				socklen = sizeof(struct sockaddr_in);
-				if (bindto && strchr(bindto, ':')) {
-					/* IPV4 sock cannot bind to IPV6 address */
+				if (bindto && (strchr(bindto, ':') || !strcmp(bindto, "0"))) {
+					/* IPV4 sock can not bind to IPV6 address */
 					bindto = NULL;
 				}
 				break;