ext/sockets: socket_shutdown() having proper constants for mode.

close GH-18648

Author: devnexen

NEWS

@@ -214,6 +214,8 @@ PHP                                                                        NEWS
   . Added SO_BUSY_POOL to reduce packets poll latency. (David Carlier)
   - Added UDP_SEGMENT support to optimise multiple large datagrams over UDP
     if the kernel and hardware supports it. (David Carlier)
+  - Added SHUT_RD, SHUT_WR and SHUT_RDWR constants for socket_shutdown().
+    (David Carlier)
 
 - Sodium:
   . Fix overall theorical overflows on zend_string buffer allocations.

UPGRADING

@@ -452,6 +452,9 @@ PHP 8.5 UPGRADE NOTES
   . IP_BINDANY (FreeBSD/NetBSD/OpenBSD only).
   . SO_BUSY_POLL (Linux only).
   . UDP_SEGMENT (Linux only).
+  - SHUT_RD.
+  - SHUT_WR.
+  - SHUT_RDWR.
 
 ========================================
 11. Changes to INI File Handling

ext/sockets/sockets.c

@@ -2434,6 +2434,11 @@ PHP_FUNCTION(socket_shutdown)
 	php_sock = Z_SOCKET_P(arg1);
 	ENSURE_SOCKET_VALID(php_sock);
 
+	if (how_shutdown < SHUT_RD || how_shutdown > SHUT_RDWR) {
+		zend_argument_value_error(2, "must be one of SHUT_RD, SHUT_WR or SHUT_RDWR");
+		RETURN_THROWS();
+	}
+
 	if (shutdown(php_sock->bsd_socket, how_shutdown) != 0) {
 		PHP_SOCKET_ERROR(php_sock, "Unable to shutdown socket", errno);
 		RETURN_FALSE;

ext/sockets/sockets.stub.php

@@ -2030,6 +2030,25 @@
 const UDP_SEGMENT = UNKNOWN;
 #endif
 
+#ifdef SHUT_RDWR
+/**
+ * @var int
+ * @cvalue SHUT_RD
+ */
+const SHUT_RD = UNKNOWN;
+/**
+/**
+ * @var int
+ * @cvalue SHUT_WR
+ */
+const SHUT_WR = UNKNOWN;
+/**
+ * @var int
+ * @cvalue SHUT_RDWR
+ */
+const SHUT_RDWR = UNKNOWN;
+#endif
+
 /**
  * @strict-properties
  * @not-serializable

ext/sockets/sockets_arginfo.h

@@ -19,24 +19,29 @@ $port = 80;
 
 $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 $socketConn = socket_connect($socket, $host, $port);
-var_dump(socket_shutdown($socket,0));
+var_dump(socket_shutdown($socket,SHUT_RD));
 socket_close($socket);
 
 $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 $socketConn = socket_connect($socket, $host, $port);
-var_dump(socket_shutdown($socket,1));
+var_dump(socket_shutdown($socket,SHUT_WR));
 socket_close($socket);
 
 $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 $socketConn = socket_connect($socket, $host, $port);
-var_dump(socket_shutdown($socket,2));
+var_dump(socket_shutdown($socket,SHUT_RDWR));
 socket_close($socket);
 
 $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-var_dump(socket_shutdown($socket,0));
+var_dump(socket_shutdown($socket,SHUT_RD));
 
 $socketConn = socket_connect($socket, $host, $port);
-var_dump(socket_shutdown($socket,-1));
+
+try {
+	socket_shutdown($socket,-1);
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
 socket_close($socket);
 ?>
 --CLEAN--
@@ -54,5 +59,4 @@ bool(true)
 Warning: socket_shutdown(): Unable to shutdown socket [%d]: %s in %s on line %d
 bool(false)
 
-Warning: socket_shutdown(): Unable to shutdown socket [%d]: Invalid argument in %s on line %d
-bool(false)
+must be one of SHUT_RD, SHUT_WR or SHUT_RDWR