From ceef0035641b476ea20464d52e0df01ce97ac4bd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Apr 2019 08:10:21 +0200 Subject: - update to 0.2.3 - open https://github.com/bwoebi/php-uv/issues/66 segfault in test suite --- 2ba4d96379a826050d91b039775e9d1e148d5ef2.patch | 22 -- 60.patch | 30 --- 880d84cd838f334d88adb888f8a3b744194560d3.patch | 357 ------------------------- PHPINFO | 4 +- REFLECTION | 78 ++++-- d3433a1875581d66530874c44345fc74e8eebc64.patch | 37 --- fc685d1cb58746a8865fc4b86a38f90219de90ed.patch | 47 ---- php-pecl-uv.spec | 25 +- 8 files changed, 71 insertions(+), 529 deletions(-) delete mode 100644 2ba4d96379a826050d91b039775e9d1e148d5ef2.patch delete mode 100644 60.patch delete mode 100644 880d84cd838f334d88adb888f8a3b744194560d3.patch delete mode 100644 d3433a1875581d66530874c44345fc74e8eebc64.patch delete mode 100644 fc685d1cb58746a8865fc4b86a38f90219de90ed.patch diff --git a/2ba4d96379a826050d91b039775e9d1e148d5ef2.patch b/2ba4d96379a826050d91b039775e9d1e148d5ef2.patch deleted file mode 100644 index 4ce967e..0000000 --- a/2ba4d96379a826050d91b039775e9d1e148d5ef2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2ba4d96379a826050d91b039775e9d1e148d5ef2 Mon Sep 17 00:00:00 2001 -From: Joel Wurtz -Date: Fri, 22 Dec 2017 21:56:25 +0100 -Subject: [PATCH] Remove dependency on PHP version for GC_ADDREF macro - ---- - php_uv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/php_uv.c b/php_uv.c -index 564722c..12052b7 100644 ---- a/php_uv.c -+++ b/php_uv.c -@@ -44,7 +44,7 @@ ZEND_TSRMLS_CACHE_DEFINE() - - ZEND_DECLARE_MODULE_GLOBALS(uv); - --#if PHP_VERSION_ID < 70300 -+#ifndef GC_ADDREF - #define GC_ADDREF(ref) ++GC_REFCOUNT(ref) - #endif - diff --git a/60.patch b/60.patch deleted file mode 100644 index b4e0893..0000000 --- a/60.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b1b5729f4da87117ce07cdf091b38225b296ae58 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 27 Jun 2018 16:14:08 +0200 -Subject: [PATCH] relax tests for 7.3 - ---- - tests/300-fs_close.phpt | 2 +- - tests/330-poll-fd.phpt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/300-fs_close.phpt b/tests/300-fs_close.phpt -index 1f85500..d21ccc7 100644 ---- a/tests/300-fs_close.phpt -+++ b/tests/300-fs_close.phpt -@@ -16,4 +16,4 @@ uv_fs_open(uv_default_loop(), FIXTURE_PATH, UV::O_RDONLY, 0, function($r){ - - uv_run(); - --EXPECTF-- --Warning: uv_fs_close() expects parameter 2 to be resource, integer given in %s on line %d -+Warning: uv_fs_close() expects parameter 2 to be resource, in%s given in %s on line %d -diff --git a/tests/330-poll-fd.phpt b/tests/330-poll-fd.phpt -index ea2e3a2..3b80eec 100644 ---- a/tests/330-poll-fd.phpt -+++ b/tests/330-poll-fd.phpt -@@ -21,4 +21,4 @@ Warning: uv_poll_init(): invalid resource passed, this resource is not supported - - Warning: uv_poll_init(): uv_poll_init failed in %s on line %d - --Warning: uv_poll_start() expects parameter 1 to be UVPoll, boolean given in %s on line %d -+Warning: uv_poll_start() expects parameter 1 to be UVPoll, boo%s given in %s on line %d diff --git a/880d84cd838f334d88adb888f8a3b744194560d3.patch b/880d84cd838f334d88adb888f8a3b744194560d3.patch deleted file mode 100644 index 8863fc2..0000000 --- a/880d84cd838f334d88adb888f8a3b744194560d3.patch +++ /dev/null @@ -1,357 +0,0 @@ -From 880d84cd838f334d88adb888f8a3b744194560d3 Mon Sep 17 00:00:00 2001 -From: Bob Weinand -Date: Mon, 30 Oct 2017 14:37:56 +0100 -Subject: [PATCH] PHP 7.3 compatibility - ---- - php_uv.c | 78 ++++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 41 insertions(+), 37 deletions(-) - -diff --git a/php_uv.c b/php_uv.c -index df41fc9..564722c 100644 ---- a/php_uv.c -+++ b/php_uv.c -@@ -44,6 +44,10 @@ ZEND_TSRMLS_CACHE_DEFINE() - - ZEND_DECLARE_MODULE_GLOBALS(uv); - -+#if PHP_VERSION_ID < 70300 -+ #define GC_ADDREF(ref) ++GC_REFCOUNT(ref) -+#endif -+ - #if PHP_VERSION_ID < 70100 - #define uv_zend_wrong_parameter_class_error(throw, ...) zend_wrong_paramer_class_error(__VA_ARGS__) - #elif PHP_VERSION_ID < 70200 -@@ -498,7 +502,7 @@ static php_uv_cb_t* php_uv_cb_init_dynamic(php_uv_t *uv, zend_fcall_info *fci, z - if (ZEND_FCI_INITIALIZED(*fci)) { - Z_TRY_ADDREF(cb->fci.function_name); - if (fci->object) { -- GC_REFCOUNT(cb->fci.object)++; -+ GC_ADDREF(cb->fci.object); - } - } - -@@ -528,7 +532,7 @@ static void php_uv_cb_init(php_uv_cb_t **result, php_uv_t *uv, zend_fcall_info * - if (ZEND_FCI_INITIALIZED(*fci)) { - Z_TRY_ADDREF(cb->fci.function_name); - if (fci->object) { -- GC_REFCOUNT(cb->fci.object)++; -+ GC_ADDREF(cb->fci.object); - } - } - -@@ -1250,7 +1254,7 @@ void static destruct_uv(zend_object *obj) - - if (!php_uv_closeable_type(uv)) { - if (uv_cancel(&uv->uv.req) == UV_EBUSY) { -- ++GC_REFCOUNT(obj); -+ GC_ADDREF(obj); - } - clean_uv_handle(uv); - } else { -@@ -1546,7 +1550,7 @@ static void php_uv_listen_cb(uv_stream_t* server, int status) - TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); - - ZVAL_OBJ(¶ms[0], &uv->std); -- ++GC_REFCOUNT(&uv->std); -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_listen_cb, uv); - ZVAL_LONG(¶ms[1], status); - -@@ -1589,7 +1593,7 @@ static void php_uv_read_cb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* b - - ZVAL_OBJ(¶ms[0], &uv->std); - if (nread > 0) { // uv disables itself when it reaches EOF/error -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_read_cb, uv); - } - -@@ -1626,7 +1630,7 @@ static void php_uv_read2_cb(uv_pipe_t* handle, ssize_t nread, uv_buf_t buf, uv_h - - ZVAL_OBJ(¶ms[0], &uv->std); - if (nread > 0) { // uv disables itself when it reaches EOF/error -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_read2_cb, uv); - } - ZVAL_LONG(¶ms[1], nread); -@@ -1663,7 +1667,7 @@ static void php_uv_prepare_cb(uv_prepare_t* handle) - PHP_UV_DEBUG_PRINT("prepare_cb\n"); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_prepare_cb, uv); - - php_uv_do_callback2(&retval, uv, params, 1, PHP_UV_PREPARE_CB TSRMLS_CC); -@@ -1684,7 +1688,7 @@ static void php_uv_check_cb(uv_check_t* handle) - PHP_UV_DEBUG_PRINT("check_cb\n"); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_check_cb, uv); - - php_uv_do_callback2(&retval, uv, params, 1, PHP_UV_CHECK_CB TSRMLS_CC); -@@ -1706,7 +1710,7 @@ static void php_uv_async_cb(uv_async_t* handle) - PHP_UV_DEBUG_PRINT("async_cb\n"); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_async_cb, uv); - - php_uv_do_callback2(&retval, uv, params, 1, PHP_UV_ASYNC_CB TSRMLS_CC); -@@ -1909,7 +1913,7 @@ static void php_uv_fs_event_cb(uv_fs_event_t* req, const char* filename, int eve - PHP_UV_DEBUG_PRINT("fs_event_cb: %s, %d\n", filename, status); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_fs_event_cb, uv); - if (filename) { - ZVAL_STRING(¶ms[1], filename); -@@ -1964,7 +1968,7 @@ static void php_uv_fs_poll_cb(uv_fs_poll_t* handle, int status, const uv_stat_t* - TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_fs_poll_cb, uv); - ZVAL_LONG(¶ms[1], status); - params[2] = php_uv_stat_to_zval(prev); -@@ -1990,7 +1994,7 @@ static void php_uv_poll_cb(uv_poll_t* handle, int status, int events) - - ZVAL_OBJ(¶ms[0], &uv->std); - if (status == 0) { -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - } - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_poll_cb, uv); - ZVAL_LONG(¶ms[1], status); -@@ -2022,7 +2026,7 @@ static void php_uv_udp_recv_cb(uv_udp_t* handle, ssize_t nread, const uv_buf_t* - TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_udp_recv_cb, uv); - ZVAL_LONG(¶ms[1], nread); - ZVAL_STRINGL(¶ms[2], buf->base, nread); -@@ -2081,7 +2085,7 @@ static void php_uv_close(php_uv_t *uv) { - ZEND_ASSERT(!uv_is_closing(&uv->uv.handle)); - - if (!php_uv_is_handle_referenced(uv)) { -- ++GC_REFCOUNT(&uv->std); -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(php_uv_close, uv); - } - -@@ -2099,7 +2103,7 @@ static void php_uv_idle_cb(uv_timer_t *handle) - TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(php_uv_idle_cb, uv); - - php_uv_do_callback2(&retval, uv, params, 1, PHP_UV_IDLE_CB TSRMLS_CC); -@@ -2167,7 +2171,7 @@ static void php_uv_timer_cb(uv_timer_t *handle) - ZVAL_OBJ(¶ms[0], &uv->std); - - if (handle->repeat) { -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(php_uv_timer_cb, uv); - } - -@@ -2187,7 +2191,7 @@ static void php_uv_signal_cb(uv_signal_t *handle, int sig_num) - TSRMLS_FETCH_FROM_CTX(uv->thread_ctx); - - ZVAL_OBJ(¶ms[0], &uv->std); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(php_uv_signal_cb, uv); - ZVAL_LONG(¶ms[1], sig_num); - -@@ -2347,7 +2351,7 @@ static void php_uv_udp_send(int type, INTERNAL_FUNCTION_PARAMETERS) - Z_PARAM_FUNC_EX(fci, fcc, 1, 0) - ZEND_PARSE_PARAMETERS_END(); - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_udp_send, uv); - - PHP_UV_INIT_SEND_REQ(w, uv, data->val, data->len); -@@ -2376,7 +2380,7 @@ static void php_uv_tcp_connect(enum php_uv_socket_type type, INTERNAL_FUNCTION_P - Z_PARAM_FUNC_EX(fci, fcc, 1, 0) - ZEND_PARSE_PARAMETERS_END(); - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_tcp_connect, uv); - - PHP_UV_INIT_CONNECT(req, uv) -@@ -3499,7 +3503,7 @@ PHP_FUNCTION(uv_signal_start) - RETURN_FALSE; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_signal_start, uv); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_SIGNAL_CB); -@@ -3613,7 +3617,7 @@ PHP_FUNCTION(uv_write) - php_uv_free_write_req(w); - php_error_docref(NULL, E_WARNING, "write failed"); - } else { -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_write, uv); - } - } -@@ -3646,7 +3650,7 @@ PHP_FUNCTION(uv_write2) - php_uv_free_write_req(w); - php_error_docref(NULL, E_ERROR, "write2 failed"); - } else { -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_write2, uv); - } - } -@@ -3714,7 +3718,7 @@ PHP_FUNCTION(uv_shutdown) - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_SHUTDOWN_CB); - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_shutdown, uv); - shutdown = emalloc(sizeof(uv_shutdown_t)); - shutdown->data = uv; -@@ -3777,7 +3781,7 @@ PHP_FUNCTION(uv_read_start) - return; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_read_start, uv); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_READ_CB); -@@ -3810,7 +3814,7 @@ PHP_FUNCTION(uv_read2_start) - Z_PARAM_FUNC(fci, fcc) - ZEND_PARSE_PARAMETERS_END(); - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_read2_start, uv); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_READ2_CB); -@@ -3902,7 +3906,7 @@ PHP_FUNCTION(uv_listen) - Z_PARAM_FUNC(fci, fcc) - ZEND_PARSE_PARAMETERS_END(); - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_listen, uv); - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_LISTEN_CB); - -@@ -3986,7 +3990,7 @@ PHP_FUNCTION(uv_timer_start) - RETURN_FALSE; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_timer_start, uv); - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_TIMER_CB); - -@@ -4035,7 +4039,7 @@ PHP_FUNCTION(uv_timer_again) - RETURN_FALSE; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_timer_again, uv); - - uv_timer_again(&uv->uv.timer); -@@ -4114,7 +4118,7 @@ PHP_FUNCTION(uv_idle_start) - RETURN_FALSE; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_idle_start, uv); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_IDLE_CB); -@@ -4232,7 +4236,7 @@ PHP_FUNCTION(uv_tcp_open) - PHP_FUNCTION(uv_default_loop) - { - php_uv_loop_t *loop = php_uv_default_loop(); -- ++GC_REFCOUNT(&loop->std); -+ GC_ADDREF(&loop->std); - RETURN_OBJ(&loop->std); - } - /* }}} */ -@@ -4309,7 +4313,7 @@ PHP_FUNCTION(uv_udp_recv_start) - RETURN_FALSE; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_udp_recv_start, uv); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_RECV_CB); -@@ -4631,7 +4635,7 @@ PHP_FUNCTION(uv_pipe_connect) - Z_PARAM_FUNC(fci, fcc) - ZEND_PARSE_PARAMETERS_END(); - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_pipe_connect, uv); - - req = (uv_connect_t *) emalloc(sizeof(uv_connect_t)); -@@ -5093,7 +5097,7 @@ PHP_FUNCTION(uv_spawn) - RETVAL_LONG(ret); - } else { - php_uv_cb_init(&cb, proc, &fci, &fcc, PHP_UV_PROC_CLOSE_CB); -- ++GC_REFCOUNT(&proc->std); -+ GC_ADDREF(&proc->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_spawn, proc); - RETVAL_OBJ(&proc->std); - } -@@ -5344,7 +5348,7 @@ PHP_FUNCTION(uv_prepare_start) - RETURN_FALSE; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_prepare_start, uv); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_PREPARE_CB); -@@ -5421,7 +5425,7 @@ PHP_FUNCTION(uv_check_start) - RETURN_FALSE; - } - -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_check_start, uv); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_CHECK_CB); -@@ -5993,7 +5997,7 @@ PHP_FUNCTION(uv_poll_start) - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_POLL_CB); - if (!uv_is_active(&uv->uv.handle)) { - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_poll_start, uv); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - } - - error = uv_poll_start(&uv->uv.poll, events, php_uv_poll_cb); -@@ -6064,7 +6068,7 @@ PHP_FUNCTION(uv_fs_poll_start) - ZEND_PARSE_PARAMETERS_END(); - - php_uv_cb_init(&cb, uv, &fci, &fcc, PHP_UV_FS_POLL_CB); -- GC_REFCOUNT(&uv->std)++; -+ GC_ADDREF(&uv->std); - PHP_UV_DEBUG_OBJ_ADD_REFCOUNT(uv_fs_poll_start, uv); - - error = uv_fs_poll_start(&uv->uv.fs_poll, php_uv_fs_poll_cb, (const char*)path->val, interval); diff --git a/PHPINFO b/PHPINFO index 4c58e4c..6c4f9c3 100644 --- a/PHPINFO +++ b/PHPINFO @@ -3,5 +3,5 @@ uv PHP libuv Extension libuv Support => enabled -Version => 0.2.2 -libuv Version => 1.14 +Version => 0.2.3 +libuv Version => 1.27 diff --git a/REFLECTION b/REFLECTION index 8336eb1..df4c039 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #160 uv version 0.2.2 ] { +Extension [ extension #167 uv version 0.2.3 ] { - Functions { Function [ function uv_update_time ] { @@ -975,7 +975,7 @@ Extension [ extension #160 uv version 0.2.2 ] { - Classes [25] { Class [ class UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -1173,6 +1173,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -1190,7 +1192,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVTcp extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -1388,6 +1390,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -1405,7 +1409,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVUdp extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -1603,6 +1607,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -1620,7 +1626,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVPipe extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -1818,6 +1824,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -1835,7 +1843,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVIdle extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -2033,6 +2041,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -2050,7 +2060,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVTimer extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -2248,6 +2258,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -2265,7 +2277,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVAsync extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -2463,6 +2475,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -2480,7 +2494,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVStream extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -2678,6 +2692,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -2695,7 +2711,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVAddrinfo extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -2893,6 +2909,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -2910,7 +2928,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVProcess extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -3108,6 +3126,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -3125,7 +3145,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVPrepare extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -3323,6 +3343,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -3340,7 +3362,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVCheck extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -3538,6 +3560,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -3555,7 +3579,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVWork extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -3753,6 +3777,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -3770,7 +3796,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVFs extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -3968,6 +3994,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -3985,7 +4013,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVFsEvent extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -4183,6 +4211,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -4200,7 +4230,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVTty extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -4398,6 +4428,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -4415,7 +4447,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVFSPoll extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -4613,6 +4645,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -4630,7 +4664,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVPoll extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -4828,6 +4862,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { @@ -4845,7 +4881,7 @@ Extension [ extension #160 uv version 0.2.2 ] { Class [ final class UVSignal extends UV ] { - - Constants [197] { + - Constants [199] { Constant [ public integer RUN_DEFAULT ] { 0 } Constant [ public integer RUN_ONCE ] { 1 } Constant [ public integer RUN_NOWAIT ] { 2 } @@ -5043,6 +5079,8 @@ Extension [ extension #160 uv version 0.2.2 ] { Constant [ public integer EMLINK ] { -31 } Constant [ public integer EHOSTDOWN ] { -112 } Constant [ public integer EREMOTEIO ] { -121 } + Constant [ public integer ENOTTY ] { -25 } + Constant [ public integer EFTYPE ] { -4028 } } - Static properties [0] { diff --git a/d3433a1875581d66530874c44345fc74e8eebc64.patch b/d3433a1875581d66530874c44345fc74e8eebc64.patch deleted file mode 100644 index bf7580a..0000000 --- a/d3433a1875581d66530874c44345fc74e8eebc64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d3433a1875581d66530874c44345fc74e8eebc64 Mon Sep 17 00:00:00 2001 -From: Bob Weinand -Date: Sun, 8 Jul 2018 09:07:31 +0200 -Subject: [PATCH] Fix ZTS build - ---- - php_uv.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/php_uv.c b/php_uv.c -index b150fc4..18a4b14 100644 ---- a/php_uv.c -+++ b/php_uv.c -@@ -1364,7 +1364,11 @@ static int php_uv_do_callback3(zval *retval_ptr, php_uv_t *uv, zval *params, int - uv->callback[type]->fci.param_count = param_count; - uv->callback[type]->fci.no_separation = 1; - uv->callback[type]->fci.object = NULL; -+#if PHP_VERSION_ID >= 70300 -+ uv->callback[type]->fci.size = sizeof(zend_fcall_info); -+#else - uv->callback[type]->fcc.initialized = 1; -+#endif - - uv->callback[type]->fcc.calling_scope = NULL; - uv->callback[type]->fcc.called_scope = NULL; -@@ -2566,7 +2570,11 @@ PHP_MINIT_FUNCTION(uv) - { - PHP_UV_PROBE(MINIT); - -+#ifdef PHP_VERSION_ID >= 70300 -+ memcpy(&uv_default_handlers, &std_object_handlers, sizeof(zend_object_handlers)); -+#else - memcpy(&uv_default_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); -+#endif - uv_default_handlers.clone_obj = NULL; - uv_default_handlers.get_constructor = php_uv_get_ctor; - uv_default_handlers.cast_object = php_uv_cast_object; diff --git a/fc685d1cb58746a8865fc4b86a38f90219de90ed.patch b/fc685d1cb58746a8865fc4b86a38f90219de90ed.patch deleted file mode 100644 index 831347e..0000000 --- a/fc685d1cb58746a8865fc4b86a38f90219de90ed.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fc685d1cb58746a8865fc4b86a38f90219de90ed Mon Sep 17 00:00:00 2001 -From: Bob Weinand -Date: Wed, 28 Feb 2018 02:50:51 +0100 -Subject: [PATCH] Fix build for newest php-src master - ---- - php_uv.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/php_uv.c b/php_uv.c -index 12052b7..b150fc4 100644 ---- a/php_uv.c -+++ b/php_uv.c -@@ -50,7 +50,7 @@ ZEND_DECLARE_MODULE_GLOBALS(uv); - - #if PHP_VERSION_ID < 70100 - #define uv_zend_wrong_parameter_class_error(throw, ...) zend_wrong_paramer_class_error(__VA_ARGS__) --#elif PHP_VERSION_ID < 70200 -+#elif PHP_VERSION_ID < 70200 || PHP_VERSION_ID >= 70300 - #define uv_zend_wrong_parameter_class_error(throw, ...) zend_wrong_parameter_class_error(__VA_ARGS__) - #else - #define uv_zend_wrong_parameter_class_error(...) zend_wrong_parameter_class_error(__VA_ARGS__) -@@ -230,7 +230,11 @@ static int uv_parse_arg_object(zval *arg, zval **dest, int check_null, zend_clas - ZVAL_UNDEF(&uv->fs_fd_alt); \ - } - --#define PHP_UV_SKIP_DTOR(uv) do { GC_FLAGS(&uv->std) |= IS_OBJ_DESTRUCTOR_CALLED; } while (0) -+#if PHP_VERSION_ID < 70300 -+ #define PHP_UV_SKIP_DTOR(uv) do { GC_FLAGS(&uv->std) |= IS_OBJ_DESTRUCTOR_CALLED; } while (0) -+#else -+ #define PHP_UV_SKIP_DTOR(uv) do { GC_ADD_FLAGS(&uv->std, IS_OBJ_DESTRUCTOR_CALLED); } while (0) -+#endif - #define PHP_UV_IS_DTORED(uv) (GC_FLAGS(&uv->std) & IS_OBJ_DESTRUCTOR_CALLED) - - #define PHP_UV_SOCKADDR_IPV4_INIT(sockaddr) PHP_UV_INIT_GENERIC(sockaddr, php_uv_sockaddr_t, uv_sockaddr_ipv4_ce); -@@ -3548,7 +3552,11 @@ PHP_FUNCTION(uv_loop_delete) - ZEND_PARSE_PARAMETERS_END(); - - if (loop != UV_G(default_loop)) { -+#if PHP_VERSION_ID < 70300 - GC_FLAGS(&loop->std) |= IS_OBJ_DESTRUCTOR_CALLED; -+#else -+ GC_ADD_FLAGS(&loop->std, IS_OBJ_DESTRUCTOR_CALLED); -+#endif - destruct_uv_loop(&loop->std); - } - } diff --git a/php-pecl-uv.spec b/php-pecl-uv.spec index 6fdac09..a90c5b0 100644 --- a/php-pecl-uv.spec +++ b/php-pecl-uv.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-uv # -# Copyright (c) 2016-2018 Remi Collet +# Copyright (c) 2016-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -18,19 +18,13 @@ Summary: Libuv wrapper Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 0.2.2 -Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 0.2.3 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -Patch0: https://github.com/bwoebi/php-uv/commit/880d84cd838f334d88adb888f8a3b744194560d3.patch -Patch1: https://github.com/bwoebi/php-uv/commit/2ba4d96379a826050d91b039775e9d1e148d5ef2.patch -Patch2: https://github.com/bwoebi/php-uv/commit/fc685d1cb58746a8865fc4b86a38f90219de90ed.patch -Patch3: https://patch-diff.githubusercontent.com/raw/bwoebi/php-uv/pull/60.patch -Patch4: https://github.com/bwoebi/php-uv/commit/d3433a1875581d66530874c44345fc74e8eebc64.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear @@ -92,11 +86,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .up0 -%patch1 -p1 -b .up1 -%patch2 -p1 -b .up2 -%patch3 -p1 -b .pr60 -%patch4 -p1 -b .up3 # Sanity check, really often broken extver=$(sed -n '/define PHP_UV_VERSION/{s/.* "//;s/".*$//;p}' php_uv.h) @@ -195,6 +184,9 @@ else : only local tests when mock is used export SKIP_ONLINE_TESTS=1 fi +: see https://github.com/bwoebi/php-uv/issues/66 +rm ?TS/tests/320-fs-poll.phpt +rm ?TS/tests/330-poll-pipe.phpt : Minimal load test for NTS extension cd NTS @@ -242,6 +234,11 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Apr 29 2019 Remi Collet - 0.2.3-1 +- update to 0.2.3 +- open https://github.com/bwoebi/php-uv/issues/66 + segfault in test suite + * Wed Aug 22 2018 Remi Collet - 0.2.2-6 - add upstream patch for ZTS -- cgit