From afe868812897660841148991d09e61c5731341cf Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sat, 15 Aug 2020 21:02:08 +0200 Subject: [PATCH] Fix PHP 8 build --- php_uv.c | 137 +++++++++++++++++++++++++++++++++---------------------- php_uv.h | 6 ++- 2 files changed, 88 insertions(+), 55 deletions(-) diff --git a/php_uv.c b/php_uv.c index d32f0d8..9a3a8ac 100644 --- a/php_uv.c +++ b/php_uv.c @@ -17,6 +17,7 @@ +----------------------------------------------------------------------+ */ +#pragma GCC diagnostic ignored "-Wmissing-braces" #include "php_uv.h" #include "php_main.h" @@ -294,7 +295,11 @@ static int uv_parse_arg_object(zval *arg, zval **dest, int check_null, zend_clas #endif #if !defined(PHP_WIN32) && !(defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS)) +# if PHP_VERSION_ID >= 80000 +zend_class_entry *(*socket_ce)(void) = NULL; +# else int (*php_sockets_le_socket)(void) = NULL; +# endif #endif /* objects */ @@ -447,7 +452,7 @@ static php_socket_t php_uv_zval_to_valid_poll_fd(zval *ptr) } fd = -1; -#if !defined(PHP_WIN32) || (defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS)) +#if PHP_VERSION_ID < 80000 && (!defined(PHP_WIN32) || (defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS))) } else if (php_sockets_le_socket && (socket = (php_socket *) zend_fetch_resource_ex(ptr, NULL, php_sockets_le_socket()))) { fd = socket->bsd_socket; #endif @@ -455,6 +460,10 @@ static php_socket_t php_uv_zval_to_valid_poll_fd(zval *ptr) php_error_docref(NULL, E_WARNING, "unhandled resource type detected."); fd = -1; } +#if PHP_VERSION_ID >= 80000 && (!defined(PHP_WIN32) || (defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS))) + } else if (socket_ce && Z_TYPE_P(ptr) == IS_OBJECT && Z_OBJCE_P(ptr) == socket_ce && (socket = (php_socket *) ((char *)(Z_OBJ_P(ptr)) - XtOffsetOf(php_socket, std)))) { + fd = socket->bsd_socket; +#endif } return fd; @@ -473,7 +482,7 @@ static php_socket_t php_uv_zval_to_fd(zval *ptr) if (php_stream_cast(stream, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void *) &fd, 1) != SUCCESS || fd < 0) { fd = -1; } -#if !defined(PHP_WIN32) || (defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS)) +#if PHP_VERSION_ID < 80000 && (!defined(PHP_WIN32) || (defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS))) } else if (php_sockets_le_socket && (socket = (php_socket *) zend_fetch_resource_ex(ptr, NULL, php_sockets_le_socket()))) { fd = socket->bsd_socket; #endif @@ -495,6 +504,10 @@ static php_socket_t php_uv_zval_to_fd(zval *ptr) fd = -1; } } +#if PHP_VERSION_ID >= 80000 && (!defined(PHP_WIN32) || (defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS))) + } else if (socket_ce && Z_TYPE_P(ptr) == IS_OBJECT && Z_OBJCE_P(ptr) == socket_ce && (socket = (php_socket *) ((char *)(Z_OBJ_P(ptr)) - XtOffsetOf(php_socket, std)))) { + fd = socket->bsd_socket; +#endif } return fd; @@ -1116,7 +1129,7 @@ static void php_uv_fs_common(uv_fs_type fs_type, INTERNAL_FUNCTION_PARAMETERS) static zval php_uv_address_to_zval(const struct sockaddr *addr) { - zval tmp = {{0}}; + zval tmp = {0}; char ip[INET6_ADDRSTRLEN]; const struct sockaddr_in *a4; const struct sockaddr_in6 *a6; @@ -1156,7 +1169,7 @@ static zval php_uv_address_to_zval(const struct sockaddr *addr) static zval php_uv_make_stat(const uv_stat_t *s) { - zval tmp = {{0}}; + zval tmp = {0}; array_init(&tmp); add_assoc_long_ex(&tmp, ZEND_STRL("dev"), s->st_dev); @@ -1481,8 +1494,8 @@ static int php_uv_do_callback3(zval *retval_ptr, php_uv_t *uv, zval *params, int static void php_uv_tcp_connect_cb(uv_connect_t *req, int status) { - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t *) req->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1501,8 +1514,8 @@ static void php_uv_tcp_connect_cb(uv_connect_t *req, int status) static void php_uv_process_close_cb(uv_process_t* process, int64_t exit_status, int term_signal) { - zval retval = {{0}}; - zval params[3] = {{{0}}}; + zval retval = {0}; + zval params[3] = {0}; php_uv_t *uv = (php_uv_t *) process->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1523,8 +1536,8 @@ static void php_uv_process_close_cb(uv_process_t* process, int64_t exit_status, static void php_uv_pipe_connect_cb(uv_connect_t *req, int status) { - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t*)req->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1545,8 +1558,8 @@ static void php_uv_pipe_connect_cb(uv_connect_t *req, int status) static void php_uv_walk_cb(uv_handle_t* handle, void* arg) { /* - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); ZVAL_LONG(¶ms[0], status); @@ -1564,8 +1577,8 @@ static void php_uv_walk_cb(uv_handle_t* handle, void* arg) static void php_uv_write_cb(uv_write_t* req, int status) { write_req_t* wr = (write_req_t*) req; - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t *) req->handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1592,8 +1605,8 @@ static void php_uv_write_cb(uv_write_t* req, int status) static void php_uv_udp_send_cb(uv_udp_send_t* req, int status) { send_req_t* wr = (send_req_t*) req; - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t *) req->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1618,8 +1631,8 @@ static void php_uv_udp_send_cb(uv_udp_send_t* req, int status) static void php_uv_listen_cb(uv_stream_t* server, int status) { - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t *) server->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1640,8 +1653,8 @@ static void php_uv_listen_cb(uv_stream_t* server, int status) static void php_uv_shutdown_cb(uv_shutdown_t* handle, int status) { - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t *) handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1659,8 +1672,8 @@ static void php_uv_shutdown_cb(uv_shutdown_t* handle, int status) static void php_uv_read_cb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf) { - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t *) handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1694,8 +1707,8 @@ static void php_uv_read_cb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* b /* unused static void php_uv_read2_cb(uv_pipe_t* handle, ssize_t nread, uv_buf_t buf, uv_handle_type pending) { - zval retval = {{0}}; - zval params[3] = {{{0}}}; + zval retval = {0}; + zval params[3] = {0}; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1730,7 +1743,7 @@ static void php_uv_read2_cb(uv_pipe_t* handle, ssize_t nread, uv_buf_t buf, uv_h static void php_uv_prepare_cb(uv_prepare_t* handle) { - zval retval = {{0}}; + zval retval = {0}; zval params[1]; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1751,7 +1764,7 @@ static void php_uv_prepare_cb(uv_prepare_t* handle) static void php_uv_check_cb(uv_check_t* handle) { - zval retval = {{0}}; + zval retval = {0}; zval params[1]; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1773,7 +1786,7 @@ static void php_uv_check_cb(uv_check_t* handle) static void php_uv_async_cb(uv_async_t* handle) { - zval retval = {{0}}; + zval retval = {0}; zval params[1]; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1795,7 +1808,7 @@ static void php_uv_async_cb(uv_async_t* handle) #if defined(ZTS) && PHP_VERSION_ID < 80000 static void php_uv_work_cb(uv_work_t* req) { - zval retval = {{0}}; + zval retval = {0}; php_uv_t *uv = (php_uv_t*)req->data; uv = (php_uv_t*)req->data; @@ -1807,7 +1820,7 @@ static void php_uv_work_cb(uv_work_t* req) static void php_uv_after_work_cb(uv_work_t* req, int status) { - zval retval = {{0}}; + zval retval = {0}; php_uv_t *uv = (php_uv_t*)req->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1827,8 +1840,8 @@ static void php_uv_after_work_cb(uv_work_t* req, int status) static void php_uv_fs_cb(uv_fs_t* req) { - zval params[3] = {{{0}}}; - zval retval = {{0}}; + zval params[3] = {0}; + zval retval = {0}; php_uv_t *uv = (php_uv_t*)req->data; int argc, i = 0; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -1974,8 +1987,8 @@ static void php_uv_fs_cb(uv_fs_t* req) static void php_uv_fs_event_cb(uv_fs_event_t* req, const char* filename, int events, int status) { - zval params[4] = {{{0}}}; - zval retval = {{0}}; + zval params[4] = {0}; + zval retval = {0}; php_uv_t *uv = (php_uv_t*)req->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2005,7 +2018,7 @@ static void php_uv_fs_event_cb(uv_fs_event_t* req, const char* filename, int eve static zval php_uv_stat_to_zval(const uv_stat_t *stat) { - zval result = {{0}}; + zval result = {0}; array_init(&result); add_assoc_long_ex(&result, ZEND_STRL("dev"), stat->st_dev); @@ -2031,8 +2044,8 @@ static zval php_uv_stat_to_zval(const uv_stat_t *stat) static void php_uv_fs_poll_cb(uv_fs_poll_t* handle, int status, const uv_stat_t* prev, const uv_stat_t* curr) { - zval params[4] = {{{0}}}; - zval retval = {{0}}; + zval params[4] = {0}; + zval retval = {0}; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2056,8 +2069,8 @@ static void php_uv_fs_poll_cb(uv_fs_poll_t* handle, int status, const uv_stat_t* static void php_uv_poll_cb(uv_poll_t* handle, int status, int events) { - zval params[4] = {{{0}}}; - zval retval = {{0}}; + zval params[4] = {0}; + zval retval = {0}; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2089,8 +2102,8 @@ static void php_uv_poll_cb(uv_poll_t* handle, int status, int events) static void php_uv_udp_recv_cb(uv_udp_t* handle, ssize_t nread, const uv_buf_t* buf, const struct sockaddr* addr, unsigned flags) { /* TODO: is this correctly implmented? */ - zval retval = {{0}}; - zval params[3] = {{{0}}}; + zval retval = {0}; + zval params[3] = {0}; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2126,8 +2139,8 @@ static void php_uv_read_alloc(uv_handle_t* handle, size_t suggested_size, uv_buf static void php_uv_close_cb(uv_handle_t *handle) { - zval retval = {{0}}; - zval params[1] = {{{0}}}; + zval retval = {0}; + zval params[1] = {0}; php_uv_t *uv = (php_uv_t *) handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2168,8 +2181,8 @@ static void php_uv_close(php_uv_t *uv) { static void php_uv_idle_cb(uv_timer_t *handle) { - zval retval = {{0}}; - zval params[1] = {{{0}}}; + zval retval = {0}; + zval params[1] = {0}; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2188,8 +2201,8 @@ static void php_uv_idle_cb(uv_timer_t *handle) static void php_uv_getaddrinfo_cb(uv_getaddrinfo_t* handle, int status, struct addrinfo* res) { - zval retval = {{0}}; - zval params[1] = {{{0}}}; + zval retval = {0}; + zval params[1] = {0}; struct addrinfo *address; char ip[INET6_ADDRSTRLEN]; const char *addr; @@ -2237,8 +2250,8 @@ static void php_uv_getaddrinfo_cb(uv_getaddrinfo_t* handle, int status, struct a static void php_uv_timer_cb(uv_timer_t *handle) { - zval retval = {{0}}; - zval params[1] = {{{0}}}; + zval retval = {0}; + zval params[1] = {0}; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2259,8 +2272,8 @@ static void php_uv_timer_cb(uv_timer_t *handle) static void php_uv_signal_cb(uv_signal_t *handle, int sig_num) { - zval retval = {{0}}; - zval params[2] = {{{0}}}; + zval retval = {0}; + zval params[2] = {0}; php_uv_t *uv = (php_uv_t*)handle->data; TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); @@ -2472,7 +2485,7 @@ static void php_uv_tcp_connect(enum php_uv_socket_type type, INTERNAL_FUNCTION_P /* zend */ static zend_function_entry php_uv_empty_methods[] = { - {NULL, NULL, NULL} + {0} }; #if PHP_VERSION_ID >= 80000 @@ -2760,10 +2773,17 @@ PHP_MINIT_FUNCTION(uv) zend_module_entry *sockets; if ((sockets = zend_hash_str_find_ptr(&module_registry, ZEND_STRL("sockets")))) { if (sockets->handle) { // shared +# if PHP_VERSION_ID >= 80000 + socket_ce = (int (*)(void)) DL_FETCH_SYMBOL(sockets->handle, "_socket_ce"); + if (socket_ce == NULL) { + socket_ce = (int (*)(void)) DL_FETCH_SYMBOL(sockets->handle, "_socket_ce"); + } +# else php_sockets_le_socket = (int (*)(void)) DL_FETCH_SYMBOL(sockets->handle, "php_sockets_le_socket"); if (php_sockets_le_socket == NULL) { php_sockets_le_socket = (int (*)(void)) DL_FETCH_SYMBOL(sockets->handle, "_php_sockets_le_socket"); } +#endif } } } @@ -4837,7 +4857,7 @@ PHP_FUNCTION(uv_stdio_new) php_error_docref(NULL, E_WARNING, "passed resource without file descriptor"); RETURN_FALSE; } -#if !defined(PHP_WIN32) || defined(HAVE_SOCKET) +#if PHP_VERSION_ID < 80000 && (!defined(PHP_WIN32) || (defined(HAVE_SOCKET) && !defined(COMPILE_DL_SOCKETS))) } else if ((socket = (php_socket *) zend_fetch_resource_ex(handle, NULL, php_sockets_le_socket()))) { fd = socket->bsd_socket; #endif @@ -4859,8 +4879,17 @@ PHP_FUNCTION(uv_stdio_new) php_error_docref(NULL, E_WARNING, "flags must be exactly one of UV::INHERIT_STREAM or UV::CREATE_PIPE for UV handles"); RETURN_FALSE; } +#if PHP_VERSION_ID >= 80000 && (!defined(PHP_WIN32) || (defined(HAVE_SOCKETS) && !defined(COMPILE_DL_SOCKETS))) + } else if (socket_ce && Z_TYPE_P(handle) == IS_OBJECT && Z_OBJCE_P(handle) == socket_ce && (socket = (php_socket *) ((char *)(Z_OBJ_P(handle)) - XtOffsetOf(php_socket, std)))) { + fd = socket->bsd_socket; + if (flags & (UV_CREATE_PIPE | UV_INHERIT_STREAM)) { + php_error_docref(NULL, E_WARNING, "flags must not be UV::CREATE_PIPE or UV::INHERIT_STREAM for socket objects"); + RETURN_FALSE; + } + flags |= UV_INHERIT_FD; +#endif } else { - php_error_docref(NULL, E_WARNING, "passed unexpected value, expected instance of UV, file resource or socket resource"); + php_error_docref(NULL, E_WARNING, "passed unexpected value, expected instance of UV, file resource or socket object"); RETURN_FALSE; } @@ -6404,7 +6433,7 @@ static zend_function_entry uv_functions[] = { PHP_FE(uv_signal_init, arginfo_uv_signal_init) PHP_FE(uv_signal_start, arginfo_uv_signal_start) PHP_FE(uv_signal_stop, arginfo_uv_signal_stop) - {NULL, NULL, NULL} + {0} }; PHP_MINFO_FUNCTION(uv) diff --git a/php_uv.h b/php_uv.h index 6b93679..d5935fc 100755 --- a/php_uv.h +++ b/php_uv.h @@ -40,7 +40,11 @@ #elif !defined(PHP_WIN32) typedef struct { int bsd_socket; - /* other fields are not interesting... */ + int type; + int error; + int blocking; + zval zstream; + zend_object std; } php_socket; #endif