diff --git a/NEWS b/NEWS index eea4bfe6896..0c9efb5ba63 100644 --- a/NEWS +++ b/NEWS @@ -106,6 +106,7 @@ PHP NEWS . Added AF_DIVERT for raw socket for divert ports. (David Carlier) . Added SOL_UPDLITE, UDPLITE_RECV_CSCOV and UDPLITE_SEND_CSCOV for updlite protocol support. (David Carlier) + . Added SO_RERROR, SO_ZEROIZE and SO_SPLICE netbsd and openbsd constants. - Standard: . E_NOTICEs emitted by unserialize() have been promoted to E_WARNING. (timwolla) diff --git a/UPGRADING b/UPGRADING index 9b5febd6003..5a8429b6e76 100644 --- a/UPGRADING +++ b/UPGRADING @@ -144,6 +144,9 @@ PHP 8.3 UPGRADE NOTES . SOL_UDPLITE. . UDPLITE_RECV_CSCOV. . UDPLITE_SEND_CSCOV. + . SO_RERROR (NetBSD only). + . SO_ZEROIZE (OpenBSD only). + . SO_SPLICE (OpenBSD only). ======================================== 11. Changes to INI File Handling diff --git a/ext/sockets/sockets.stub.php b/ext/sockets/sockets.stub.php index 82969270fb8..391d259271c 100644 --- a/ext/sockets/sockets.stub.php +++ b/ext/sockets/sockets.stub.php @@ -293,6 +293,27 @@ const SO_SETFIB = UNKNOWN; */ const SO_ACCEPTFILTER = UNKNOWN; #endif +#ifdef SO_RERROR +/** + * @var int + * @cvalue SO_RERROR + */ +const SO_RERROR = UNKNOWN; +#endif +#ifdef SO_SOPLICE +/** + * @var int + * @cvalue SO_SPLICE + */ +const SO_SPLICE = UNKNOWN; +#endif +#ifdef SO_ZEROIZE +/** + * @var int + * @cvalue SO_ZEROIZE + */ +const SO_ZEROIZE = UNKNOWN; +#endif #ifdef SOL_FILTER /** * @var int diff --git a/ext/sockets/sockets_arginfo.h b/ext/sockets/sockets_arginfo.h index f630d829f4c..b16bdf100aa 100644 --- a/ext/sockets/sockets_arginfo.h +++ b/ext/sockets/sockets_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: d02c3c772eab5d9c1310839d2464887993f8e8de */ + * Stub hash: 2ee788183fb6f9925b3a7a8166076703319ba8c3 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_select, 0, 4, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(1, read, IS_ARRAY, 1) @@ -432,6 +432,15 @@ static void register_sockets_symbols(int module_number) #if defined(SO_ACCEPTFILTER) REGISTER_LONG_CONSTANT("SO_ACCEPTFILTER", SO_ACCEPTFILTER, CONST_PERSISTENT); #endif +#if defined(SO_RERROR) + REGISTER_LONG_CONSTANT("SO_RERROR", SO_RERROR, CONST_PERSISTENT); +#endif +#if defined(SO_SOPLICE) + REGISTER_LONG_CONSTANT("SO_SPLICE", SO_SPLICE, CONST_PERSISTENT); +#endif +#if defined(SO_ZEROIZE) + REGISTER_LONG_CONSTANT("SO_ZEROIZE", SO_ZEROIZE, CONST_PERSISTENT); +#endif #if defined(SOL_FILTER) REGISTER_LONG_CONSTANT("SOL_FILTER", SOL_FILTER, CONST_PERSISTENT); #endif