From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 14 Apr 2020 13:16:28 +0000 (+0200)
Subject: Use UNKNOWN default for socket_connect()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0006b5fac607a10b47a407beb32cab156351e8f;p=php

Use UNKNOWN default for socket_connect()

Specifying the port is mandatory for INET sockets.
---

diff --git a/ext/sockets/sockets.stub.php b/ext/sockets/sockets.stub.php
index 5fe5b1cf73..680a1b8835 100644
--- a/ext/sockets/sockets.stub.php
+++ b/ext/sockets/sockets.stub.php
@@ -41,7 +41,7 @@ function socket_getpeername($socket, &$addr, &$port = UNKNOWN): bool {}
 function socket_create(int $domain, int $type, int $protocol) {}
 
 /** @param resource $socket */
-function socket_connect($socket, string $addr, int $port = 0): bool {}
+function socket_connect($socket, string $addr, int $port = UNKNOWN): bool {}
 
 function socket_strerror(int $errno): string {}
 
diff --git a/ext/sockets/sockets_arginfo.h b/ext/sockets/sockets_arginfo.h
index 929ad01229..3c8e91d0ec 100644
--- a/ext/sockets/sockets_arginfo.h
+++ b/ext/sockets/sockets_arginfo.h
@@ -61,14 +61,18 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_connect, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, socket)
 	ZEND_ARG_TYPE_INFO(0, addr, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "0")
+	ZEND_ARG_TYPE_INFO(0, port, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_strerror, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, errno, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_socket_bind arginfo_socket_connect
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_bind, 0, 2, _IS_BOOL, 0)
+	ZEND_ARG_INFO(0, socket)
+	ZEND_ARG_TYPE_INFO(0, addr, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_recv, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, socket)