address feedback

Author: devnexen

UPGRADING

@@ -486,6 +486,13 @@ PHP 8.6 UPGRADE NOTES
     sockets. A positive value enables lingering for that many seconds, zero
     or a negative value disables it. Values above 65535 are clamped as the
     linger time is limited to an unsigned short on some platforms.
+  . Added stream socket context options so_rcvbuf and so_sndbuf that set the
+    socket receive and send buffer sizes in bytes (SO_RCVBUF and SO_SNDBUF) on
+    TCP and UDP sockets. The value must be an integer between 1 and 2147483647,
+    any other value makes the stream creation fail. The operating system may
+    round, cap or otherwise adjust the requested size, and may stop sizing that
+    buffer automatically, so the size read back can differ from the one
+    requested.
   . Allowed casting filtered streams as file descriptors for select.
   . Added the "write_seek_mode" filter parameter for the bz2, iconv,
     zlib, and string stream filters. This parameter must be set via an

ext/standard/tests/network/so_rcvbuf_sndbuf_error.phpt

@@ -5,29 +5,30 @@ SO_RCVBUF and SO_SNDBUF context options reject invalid values
 foreach (['so_rcvbuf', 'so_sndbuf'] as $option) {
     foreach ([0, -1, 'abc'] as $value) {
         $context = stream_context_create(['socket' => [$option => $value]]);
-        try {
-            @stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr,
-                STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $context);
-        } catch (ValueError $e) {
-            echo $e::class, ': ', $e->getMessage(), PHP_EOL;
-        }
+        var_dump(@stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr,
+            STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $context));
+        echo $errstr, PHP_EOL;
     }
 }
 
 $context = stream_context_create(['socket' => ['so_rcvbuf' => 0]]);
-try {
-    @stream_socket_client("tcp://127.0.0.1:1", $errno, $errstr, 1,
-        STREAM_CLIENT_CONNECT, $context);
-} catch (ValueError $e) {
-    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
-}
+var_dump(@stream_socket_client("tcp://127.0.0.1:1", $errno, $errstr, 1,
+    STREAM_CLIENT_CONNECT, $context));
+echo $errstr, PHP_EOL;
 
 ?>
 --EXPECT--
-ValueError: stream context option 'so_rcvbuf' must be between 1 and 2147483647
-ValueError: stream context option 'so_rcvbuf' must be between 1 and 2147483647
-ValueError: stream context option 'so_rcvbuf' must be between 1 and 2147483647
-ValueError: stream context option 'so_sndbuf' must be between 1 and 2147483647
-ValueError: stream context option 'so_sndbuf' must be between 1 and 2147483647
-ValueError: stream context option 'so_sndbuf' must be between 1 and 2147483647
-ValueError: stream context option 'so_rcvbuf' must be between 1 and 2147483647
+bool(false)
+so_rcvbuf context option must be between 1 and 2147483647
+bool(false)
+so_rcvbuf context option must be between 1 and 2147483647
+bool(false)
+so_rcvbuf context option must be between 1 and 2147483647
+bool(false)
+so_sndbuf context option must be between 1 and 2147483647
+bool(false)
+so_sndbuf context option must be between 1 and 2147483647
+bool(false)
+so_sndbuf context option must be between 1 and 2147483647
+bool(false)
+so_rcvbuf context option must be between 1 and 2147483647

main/streams/xp_socket.c

@@ -677,7 +677,8 @@ static inline char *parse_ip_address(php_stream_xport_param *xparam, int *portno
 	return parse_ip_address_ex(xparam->inputs.name, xparam->inputs.namelen, portno, xparam->want_errortext, &xparam->outputs.error_text);
 }
 
-static int php_sockop_parse_buffer_sizes(php_stream *stream, php_sockvals *sockvals)
+static int php_sockop_parse_buffer_sizes(php_stream *stream, php_stream_xport_param *xparam,
+		php_sockvals *sockvals)
 {
 	zval *tmpzval;
 
@@ -690,7 +691,9 @@ static int php_sockop_parse_buffer_sizes(php_stream *stream, php_sockvals *sockv
 		zend_long bufsize = zval_get_long(tmpzval);
 
 		if (bufsize < 1 || bufsize > INT_MAX) {
-			zend_value_error("stream context option 'so_rcvbuf' must be between 1 and %d", INT_MAX);
+			if (xparam->want_errortext) {
+				xparam->outputs.error_text = strpprintf(0, "so_rcvbuf context option must be between 1 and %d", INT_MAX);
+			}
 			return -1;
 		}
 
@@ -704,7 +707,9 @@ static int php_sockop_parse_buffer_sizes(php_stream *stream, php_sockvals *sockv
 		zend_long bufsize = zval_get_long(tmpzval);
 
 		if (bufsize < 1 || bufsize > INT_MAX) {
-			zend_value_error("stream context option 'so_sndbuf' must be between 1 and %d", INT_MAX);
+			if (xparam->want_errortext) {
+				xparam->outputs.error_text = strpprintf(0, "so_sndbuf context option must be between 1 and %d", INT_MAX);
+			}
 			return -1;
 		}
 
@@ -759,7 +764,7 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t *
 		return -1;
 	}
 
-	if (php_sockop_parse_buffer_sizes(stream, &sockvals) == -1) {
+	if (php_sockop_parse_buffer_sizes(stream, xparam, &sockvals) == -1) {
 		efree(host);
 		return -1;
 	}
@@ -912,7 +917,7 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_
 		return -1;
 	}
 
-	if (php_sockop_parse_buffer_sizes(stream, &sockvals) == -1) {
+	if (php_sockop_parse_buffer_sizes(stream, xparam, &sockvals) == -1) {
 		efree(host);
 		return -1;
 	}