From 53badd4bbbbf234d5e5a48865522274407c5a6fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Apr 2020 11:58:11 +0200 Subject: update to 4.5.0 open https://github.com/swoole/swoole-src/issues/3276 broken 32-bit build --- PHPINFO | 4 +- REFLECTION | 457 ++++++++++++++++++++++++++++++++++++-------------- php-pecl-swoole4.spec | 9 +- 3 files changed, 336 insertions(+), 134 deletions(-) diff --git a/PHPINFO b/PHPINFO index f4bfdb3..f1d6af5 100644 --- a/PHPINFO +++ b/PHPINFO @@ -3,8 +3,8 @@ swoole Swoole => enabled Author => Swoole Team -Version => 4.4.18 -Built => Apr 26 2020 00:00:00 +Version => 4.5.0 +Built => Apr 27 2020 00:00:00 coroutine => enabled trace_log => enabled epoll => enabled diff --git a/REFLECTION b/REFLECTION index 5c869ea..a4b6ead 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #113 swoole version 4.4.18 ] { +Extension [ extension #113 swoole version 4.5.0 ] { - INI { Entry [ swoole.enable_coroutine ] @@ -21,12 +21,12 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } - - Constants [329] { - Constant [ string SWOOLE_VERSION ] { 4.4.18 } - Constant [ int SWOOLE_VERSION_ID ] { 40418 } + - Constants [334] { + Constant [ string SWOOLE_VERSION ] { 4.5.0 } + Constant [ int SWOOLE_VERSION_ID ] { 40500 } Constant [ int SWOOLE_MAJOR_VERSION ] { 4 } - Constant [ int SWOOLE_MINOR_VERSION ] { 4 } - Constant [ int SWOOLE_RELEASE_VERSION ] { 18 } + Constant [ int SWOOLE_MINOR_VERSION ] { 5 } + Constant [ int SWOOLE_RELEASE_VERSION ] { 0 } Constant [ string SWOOLE_EXTRA_VERSION ] { } Constant [ bool SWOOLE_DEBUG ] { } Constant [ bool SWOOLE_HAVE_COMPRESSION ] { 1 } @@ -60,9 +60,6 @@ Extension [ extension #113 swoole version 4.4.18 ] { Constant [ int SWOOLE_SSLv3_METHOD ] { 1 } Constant [ int SWOOLE_SSLv3_SERVER_METHOD ] { 2 } Constant [ int SWOOLE_SSLv3_CLIENT_METHOD ] { 3 } - Constant [ int SWOOLE_SSLv23_METHOD ] { 0 } - Constant [ int SWOOLE_SSLv23_SERVER_METHOD ] { 4 } - Constant [ int SWOOLE_SSLv23_CLIENT_METHOD ] { 5 } Constant [ int SWOOLE_TLSv1_METHOD ] { 6 } Constant [ int SWOOLE_TLSv1_SERVER_METHOD ] { 7 } Constant [ int SWOOLE_TLSv1_CLIENT_METHOD ] { 8 } @@ -72,9 +69,14 @@ Extension [ extension #113 swoole version 4.4.18 ] { Constant [ int SWOOLE_TLSv1_2_METHOD ] { 12 } Constant [ int SWOOLE_TLSv1_2_SERVER_METHOD ] { 13 } Constant [ int SWOOLE_TLSv1_2_CLIENT_METHOD ] { 14 } - Constant [ int SWOOLE_DTLSv1_METHOD ] { 15 } - Constant [ int SWOOLE_DTLSv1_SERVER_METHOD ] { 16 } - Constant [ int SWOOLE_DTLSv1_CLIENT_METHOD ] { 17 } + Constant [ int SWOOLE_DTLS_SERVER_METHOD ] { 16 } + Constant [ int SWOOLE_DTLS_CLIENT_METHOD ] { 15 } + Constant [ int SWOOLE_SSLv23_METHOD ] { 0 } + Constant [ int SWOOLE_SSLv23_SERVER_METHOD ] { 4 } + Constant [ int SWOOLE_SSLv23_CLIENT_METHOD ] { 5 } + Constant [ int SWOOLE_TLS_METHOD ] { 0 } + Constant [ int SWOOLE_TLS_SERVER_METHOD ] { 4 } + Constant [ int SWOOLE_TLS_CLIENT_METHOD ] { 5 } Constant [ int SWOOLE_EVENT_READ ] { 512 } Constant [ int SWOOLE_EVENT_WRITE ] { 1024 } Constant [ int SWOOLE_STRERROR_SYSTEM ] { 0 } @@ -104,15 +106,16 @@ Extension [ extension #113 swoole version 4.4.18 ] { Constant [ int SWOOLE_ERROR_SESSION_NOT_EXIST ] { 1005 } Constant [ int SWOOLE_ERROR_SESSION_INVALID_ID ] { 1006 } Constant [ int SWOOLE_ERROR_SESSION_DISCARD_TIMEOUT_DATA ] { 1007 } - Constant [ int SWOOLE_ERROR_OUTPUT_BUFFER_OVERFLOW ] { 1008 } - Constant [ int SWOOLE_ERROR_OUTPUT_SEND_YIELD ] { 1009 } - Constant [ int SWOOLE_ERROR_SSL_NOT_READY ] { 1010 } - Constant [ int SWOOLE_ERROR_SSL_CANNOT_USE_SENFILE ] { 1011 } - Constant [ int SWOOLE_ERROR_SSL_EMPTY_PEER_CERTIFICATE ] { 1012 } - Constant [ int SWOOLE_ERROR_SSL_VEFIRY_FAILED ] { 1013 } - Constant [ int SWOOLE_ERROR_SSL_BAD_CLIENT ] { 1014 } - Constant [ int SWOOLE_ERROR_SSL_BAD_PROTOCOL ] { 1015 } - Constant [ int SWOOLE_ERROR_SSL_RESET ] { 1016 } + Constant [ int SWOOLE_ERROR_SESSION_DISCARD_DATA ] { 1008 } + Constant [ int SWOOLE_ERROR_OUTPUT_BUFFER_OVERFLOW ] { 1009 } + Constant [ int SWOOLE_ERROR_OUTPUT_SEND_YIELD ] { 1010 } + Constant [ int SWOOLE_ERROR_SSL_NOT_READY ] { 1011 } + Constant [ int SWOOLE_ERROR_SSL_CANNOT_USE_SENFILE ] { 1012 } + Constant [ int SWOOLE_ERROR_SSL_EMPTY_PEER_CERTIFICATE ] { 1013 } + Constant [ int SWOOLE_ERROR_SSL_VERIFY_FAILED ] { 1014 } + Constant [ int SWOOLE_ERROR_SSL_BAD_CLIENT ] { 1015 } + Constant [ int SWOOLE_ERROR_SSL_BAD_PROTOCOL ] { 1016 } + Constant [ int SWOOLE_ERROR_SSL_RESET ] { 1017 } Constant [ int SWOOLE_ERROR_PACKAGE_LENGTH_TOO_LARGE ] { 1201 } Constant [ int SWOOLE_ERROR_PACKAGE_LENGTH_NOT_FOUND ] { 1202 } Constant [ int SWOOLE_ERROR_DATA_LENGTH_TOO_LARGE ] { 1203 } @@ -300,6 +303,8 @@ Extension [ extension #113 swoole version 4.4.18 ] { Constant [ int SWOOLE_TASK_COROUTINE ] { 32 } Constant [ int SWOOLE_TASK_PEEK ] { 64 } Constant [ int SWOOLE_TASK_NOREPLY ] { 128 } + Constant [ int SWOOLE_WORKER_BUSY ] { 1 } + Constant [ int SWOOLE_WORKER_IDLE ] { 2 } Constant [ int SWOOLE_WEBSOCKET_STATUS_CONNECTION ] { 1 } Constant [ int SWOOLE_WEBSOCKET_STATUS_HANDSHAKE ] { 2 } Constant [ int SWOOLE_WEBSOCKET_STATUS_ACTIVE ] { 3 } @@ -448,12 +453,44 @@ Extension [ extension #113 swoole version 4.4.18 ] { Parameter #1 [ $type ] } } + Function [ function swoole_mime_type_add ] { + + - Parameters [2] { + Parameter #0 [ $suffix ] + Parameter #1 [ $mime_type ] + } + } + Function [ function swoole_mime_type_set ] { + + - Parameters [2] { + Parameter #0 [ $suffix ] + Parameter #1 [ $mime_type ] + } + } + Function [ function swoole_mime_type_delete ] { + + - Parameters [1] { + Parameter #0 [ $suffix ] + } + } + Function [ function swoole_mime_type_get ] { + + - Parameters [1] { + Parameter #0 [ $filename ] + } + } Function [ function swoole_get_mime_type ] { - Parameters [1] { Parameter #0 [ $filename ] } } + Function [ function swoole_mime_type_exists ] { + + - Parameters [1] { + Parameter #0 [ $filename ] + } + } Function [ function swoole_clear_dns_cache ] { - Parameters [0] { @@ -597,7 +634,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } - - Classes [47] { + - Classes [46] { Class [ class Swoole\Exception extends Exception implements Throwable ] { - Constants [0] { @@ -943,95 +980,6 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } - Class [ class Swoole\Buffer ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [2] { - Property [ public $capacity ] - Property [ public $length ] - } - - - Methods [10] { - Method [ public method __construct ] { - - - Parameters [1] { - Parameter #0 [ $size ] - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - - Method [ public method __toString ] { - - - Parameters [0] { - } - } - - Method [ public method substr ] { - - - Parameters [3] { - Parameter #0 [ $offset ] - Parameter #1 [ $length ] - Parameter #2 [ $remove ] - } - } - - Method [ public method write ] { - - - Parameters [2] { - Parameter #0 [ $offset ] - Parameter #1 [ $data ] - } - } - - Method [ public method read ] { - - - Parameters [2] { - Parameter #0 [ $offset ] - Parameter #1 [ $length ] - } - } - - Method [ public method append ] { - - - Parameters [1] { - Parameter #0 [ $data ] - } - } - - Method [ public method expand ] { - - - Parameters [1] { - Parameter #0 [ $size ] - } - } - - Method [ public method recycle ] { - - - Parameters [0] { - } - } - - Method [ public method clear ] { - - - Parameters [0] { - } - } - } - } - Class [ class Swoole\Lock ] { - Constants [5] { @@ -1891,7 +1839,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { - Static properties [0] { } - - Static methods [28] { + - Static methods [33] { Method [ static public method create ] { - Parameters [2] { @@ -1981,6 +1929,13 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ static public method getElapsed ] { + + - Parameters [1] { + Parameter #0 [ $cid ] + } + } + Method [ static public method list ] { - Parameters [0] { @@ -2095,6 +2050,38 @@ Extension [ extension #113 swoole version 4.4.18 ] { Parameter #0 [ $path ] } } + + Method [ static public method wait ] { + + - Parameters [1] { + Parameter #0 [ $timeout ] + } + } + + Method [ static public method waitPid ] { + + - Parameters [2] { + Parameter #0 [ $pid ] + Parameter #1 [ $timeout ] + } + } + + Method [ static public method waitSignal ] { + + - Parameters [2] { + Parameter #0 [ $signo ] + Parameter #1 [ $timeout ] + } + } + + Method [ static public method waitEvent ] { + + - Parameters [3] { + Parameter #0 [ $fd ] + Parameter #1 [ $events ] + Parameter #2 [ $timeout ] + } + } } - Properties [0] { @@ -2525,7 +2512,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { - Static properties [0] { } - - Static methods [11] { + - Static methods [15] { Method [ static public method gethostbyname ] { - Parameters [3] { @@ -2616,6 +2603,38 @@ Extension [ extension #113 swoole version 4.4.18 ] { Parameter #0 [ $path ] } } + + Method [ static public method wait ] { + + - Parameters [1] { + Parameter #0 [ $timeout ] + } + } + + Method [ static public method waitPid ] { + + - Parameters [2] { + Parameter #0 [ $pid ] + Parameter #1 [ $timeout ] + } + } + + Method [ static public method waitSignal ] { + + - Parameters [2] { + Parameter #0 [ $signo ] + Parameter #1 [ $timeout ] + } + } + + Method [ static public method waitEvent ] { + + - Parameters [3] { + Parameter #0 [ $fd ] + Parameter #1 [ $events ] + Parameter #2 [ $timeout ] + } + } } - Properties [0] { @@ -2752,12 +2771,6 @@ Extension [ extension #113 swoole version 4.4.18 ] { } - Static methods [3] { - Method [ static public method enableStrictMode ] { - - - Parameters [0] { - } - } - Method [ static public method enableCoroutine ] { - Parameters [2] { @@ -2771,6 +2784,13 @@ Extension [ extension #113 swoole version 4.4.18 ] { - Parameters [0] { } } + + Method [ static public method setHookFlags ] { + + - Parameters [1] { + Parameter #0 [ $flags ] + } + } } - Properties [0] { @@ -2797,7 +2817,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ public $errMsg ] } - - Methods [21] { + - Methods [24] { Method [ public method __construct ] { - Parameters [3] { @@ -2838,6 +2858,19 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method checkLiveness ] { + + - Parameters [0] { + } + } + + Method [ public method peek ] { + + - Parameters [1] { + Parameter #0 [ $length ] + } + } + Method [ public method recv ] { - Parameters [2] { @@ -2927,6 +2960,12 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method sslHandshake ] { + + - Parameters [0] { + } + } + Method [ public method shutdown ] { - Parameters [1] { @@ -3357,7 +3396,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ public $body ] } - - Methods [25] { + - Methods [28] { Method [ public method __construct ] { - Parameters [3] { @@ -3458,6 +3497,18 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method getpeername ] { + + - Parameters [0] { + } + } + + Method [ public method getsockname ] { + + - Parameters [0] { + } + } + Method [ public method get ] { - Parameters [1] { @@ -3512,6 +3563,12 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method getPeerCert ] { + + - Parameters [0] { + } + } + Method [ public method upgrade ] { - Parameters [1] { @@ -5206,7 +5263,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ public $ssl ] } - - Methods [12] { + - Methods [13] { Method [ public method __construct ] { - Parameters [3] { @@ -5272,6 +5329,13 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method read ] { + + - Parameters [1] { + Parameter #0 [ $timeout ] + } + } + Method [ public method goaway ] { - Parameters [2] { @@ -5412,11 +5476,13 @@ Extension [ extension #113 swoole version 4.4.18 ] { - Static methods [0] { } - - Properties [23] { + - Properties [25] { Property [ private $onStart ] Property [ private $onShutdown ] Property [ private $onWorkerStart ] Property [ private $onWorkerStop ] + Property [ private $onBeforeReload ] + Property [ private $onAfterReload ] Property [ private $onWorkerExit ] Property [ private $onWorkerError ] Property [ private $onTask ] @@ -5438,7 +5504,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ public $worker_pid ] } - - Methods [42] { + - Methods [47] { Method [ public method __construct ] { - Parameters [4] { @@ -5678,6 +5744,37 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method getWorkerId ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerStatus ] { + + - Parameters [1] { + Parameter #0 [ $worker_id ] + } + } + + Method [ public method getManagerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getMasterPid ] { + + - Parameters [0] { + } + } + Method [ public method connection_info ] { - Parameters [2] { @@ -5986,13 +6083,19 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ public $tmpfiles ] } - - Methods [3] { + - Methods [4] { Method [ public method rawContent ] { - Parameters [0] { } } + Method [ public method getContent ] { + + - Parameters [0] { + } + } + Method [ public method getData ] { - Parameters [0] { @@ -6018,8 +6121,9 @@ Extension [ extension #113 swoole version 4.4.18 ] { - Static methods [1] { Method [ static public method create ] { - - Parameters [1] { - Parameter #0 [ $fd ] + - Parameters [2] { + Parameter #0 [ $server ] + Parameter #1 [ $fd ] } } } @@ -6228,7 +6332,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ private $onRequest ] } - - Methods [42] { + - Methods [47] { Method [ public method __construct ] { - Parameters [4] { @@ -6468,6 +6572,37 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method getWorkerId ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerStatus ] { + + - Parameters [1] { + Parameter #0 [ $worker_id ] + } + } + + Method [ public method getManagerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getMasterPid ] { + + - Parameters [0] { + } + } + Method [ public method connection_info ] { - Parameters [2] { @@ -6667,7 +6802,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ private $onHandshake ] } - - Methods [45] { + - Methods [50] { Method [ public method push ] { - Parameters [4] { @@ -6933,6 +7068,37 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method getWorkerId ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerStatus ] { + + - Parameters [1] { + Parameter #0 [ $worker_id ] + } + } + + Method [ public method getManagerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getMasterPid ] { + + - Parameters [0] { + } + } + Method [ public method connection_info ] { - Parameters [2] { @@ -7145,7 +7311,7 @@ Extension [ extension #113 swoole version 4.4.18 ] { Property [ public $worker_pid ] } - - Methods [44] { + - Methods [49] { Method [ public method start ] { - Parameters [0] { @@ -7400,6 +7566,37 @@ Extension [ extension #113 swoole version 4.4.18 ] { } } + Method [ public method getWorkerId ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getWorkerStatus ] { + + - Parameters [1] { + Parameter #0 [ $worker_id ] + } + } + + Method [ public method getManagerPid ] { + + - Parameters [0] { + } + } + + Method [ public method getMasterPid ] { + + - Parameters [0] { + } + } + Method [ public method connection_info ] { - Parameters [2] { diff --git a/php-pecl-swoole4.spec b/php-pecl-swoole4.spec index 7be645d..54ff0f0 100644 --- a/php-pecl-swoole4.spec +++ b/php-pecl-swoole4.spec @@ -27,7 +27,7 @@ %global with_brotli 0 %endif -%global upstream_version 4.4.18 +%global upstream_version 4.5.0 #global upstream_prever RC2 @@ -164,7 +164,7 @@ sed \ cd NTS # Sanity check, really often broken -extver=$(sed -n '/#define SWOOLE_VERSION /{s/.* "//;s/".*$//;p}' include/swoole.h) +extver=$(sed -n '/#define SWOOLE_VERSION /{s/.* "//;s/".*$//;p}' include/swoole_version.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. exit 1 @@ -332,6 +332,11 @@ cd ../ZTS %changelog +* Mon Apr 27 2020 Remi Collet - 4.5.0-1 +- update to 4.5.0 +- open https://github.com/swoole/swoole-src/issues/3276 + broken 32-bit build + * Sun Apr 26 2020 Remi Collet - 4.4.18-1 - update to 4.4.18 - open https://github.com/swoole/swoole-src/issues/3274 -- cgit