From d2b5bc095eefa799e07cfeeeabb4a856212fb06b Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 19 Sep 2022 12:31:31 +0200 Subject: [PATCH 1/2] Fix GH-9574: SOCKET_EPROTO constant missing since PHP 8.2 dev --- ext/sockets/sockets.stub.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/sockets/sockets.stub.php b/ext/sockets/sockets.stub.php index 997d3eb2f7ec7..9e4664d045139 100644 --- a/ext/sockets/sockets.stub.php +++ b/ext/sockets/sockets.stub.php @@ -1105,11 +1105,11 @@ */ const SOCKET_ECOMM = UNKNOWN; #endif -#ifdef PHP_SOCKET_EPROTO +#ifdef EPROTO /** * Protocol error * @var int - * @cvalue PHP_SOCKET_EPROTO + * @cvalue EPROTO */ const SOCKET_EPROTO = UNKNOWN; #endif From 1924549d687039decf2468a455392b028b46fad3 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 19 Sep 2022 13:10:21 +0200 Subject: [PATCH 2/2] Regenerate arginfo --- ext/sockets/sockets_arginfo.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/sockets/sockets_arginfo.h b/ext/sockets/sockets_arginfo.h index ff76685e2ae88..c2e3c18b2cd65 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: c4fe33bd6d665f80be942c9cc9c0ce954d719c0d */ + * Stub hash: d28c6b566f4739b1eaefb82032e620aeb59728dc */ 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) @@ -738,8 +738,8 @@ static void register_sockets_symbols(int module_number) #if defined(ECOMM) REGISTER_LONG_CONSTANT("SOCKET_ECOMM", ECOMM, CONST_PERSISTENT); #endif -#if defined(PHP_SOCKET_EPROTO) - REGISTER_LONG_CONSTANT("SOCKET_EPROTO", PHP_SOCKET_EPROTO, CONST_PERSISTENT); +#if defined(EPROTO) + REGISTER_LONG_CONSTANT("SOCKET_EPROTO", EPROTO, CONST_PERSISTENT); #endif #if defined(EMULTIHOP) REGISTER_LONG_CONSTANT("SOCKET_EMULTIHOP", EMULTIHOP, CONST_PERSISTENT);