summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO5
-rw-r--r--REFLECTION170
-rw-r--r--php-pecl-swoole4.spec25
3 files changed, 84 insertions, 116 deletions
diff --git a/PHPINFO b/PHPINFO
index c0ec602..de067d1 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,8 +3,8 @@ swoole
Swoole => enabled
Author => Swoole Team <team@swoole.com>
-Version => 4.6.7
-Built => May 16 2021 00:00:00
+Version => 4.7.0
+Built => Jul 19 2021 00:00:00
coroutine => enabled with boost asm context
trace_log => enabled
epoll => enabled
@@ -20,6 +20,7 @@ http2 => enabled
json => enabled
curl-native => enabled
pcre => enabled
+c-ares => 1.17.0
zlib => 1.2.11
brotli => E16777225/D16777225
mutex_timedlock => enabled
diff --git a/REFLECTION b/REFLECTION
index 5a23f44..e9ebf68 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
+Extension [ <persistent> extension #122 swoole version 4.7.0 ] {
- Dependencies {
Dependency [ json (Required) ]
@@ -28,12 +28,12 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
}
}
- - Constants [365] {
- Constant [ string SWOOLE_VERSION ] { 4.6.7 }
- Constant [ int SWOOLE_VERSION_ID ] { 40607 }
+ - Constants [373] {
+ Constant [ string SWOOLE_VERSION ] { 4.7.0 }
+ Constant [ int SWOOLE_VERSION_ID ] { 40700 }
Constant [ int SWOOLE_MAJOR_VERSION ] { 4 }
- Constant [ int SWOOLE_MINOR_VERSION ] { 6 }
- Constant [ int SWOOLE_RELEASE_VERSION ] { 7 }
+ Constant [ int SWOOLE_MINOR_VERSION ] { 7 }
+ Constant [ int SWOOLE_RELEASE_VERSION ] { 0 }
Constant [ string SWOOLE_EXTRA_VERSION ] { }
Constant [ bool SWOOLE_DEBUG ] { }
Constant [ bool SWOOLE_HAVE_COMPRESSION ] { 1 }
@@ -108,11 +108,13 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Constant [ int SWOOLE_ERROR_FILE_NOT_EXIST ] { 700 }
Constant [ int SWOOLE_ERROR_FILE_TOO_LARGE ] { 701 }
Constant [ int SWOOLE_ERROR_FILE_EMPTY ] { 702 }
- Constant [ int SWOOLE_ERROR_DNSLOOKUP_DUPLICATE_REQUEST ] { 703 }
- Constant [ int SWOOLE_ERROR_DNSLOOKUP_RESOLVE_FAILED ] { 704 }
- Constant [ int SWOOLE_ERROR_DNSLOOKUP_RESOLVE_TIMEOUT ] { 705 }
- Constant [ int SWOOLE_ERROR_BAD_IPV6_ADDRESS ] { 706 }
- Constant [ int SWOOLE_ERROR_UNREGISTERED_SIGNAL ] { 707 }
+ Constant [ int SWOOLE_ERROR_DNSLOOKUP_DUPLICATE_REQUEST ] { 710 }
+ Constant [ int SWOOLE_ERROR_DNSLOOKUP_RESOLVE_FAILED ] { 711 }
+ Constant [ int SWOOLE_ERROR_DNSLOOKUP_RESOLVE_TIMEOUT ] { 712 }
+ Constant [ int SWOOLE_ERROR_DNSLOOKUP_UNSUPPORTED ] { 713 }
+ Constant [ int SWOOLE_ERROR_DNSLOOKUP_NO_SERVER ] { 714 }
+ Constant [ int SWOOLE_ERROR_BAD_IPV6_ADDRESS ] { 720 }
+ Constant [ int SWOOLE_ERROR_UNREGISTERED_SIGNAL ] { 721 }
Constant [ int SWOOLE_ERROR_EVENT_SOCKET_REMOVED ] { 800 }
Constant [ int SWOOLE_ERROR_SESSION_CLOSED_BY_SERVER ] { 1001 }
Constant [ int SWOOLE_ERROR_SESSION_CLOSED_BY_CLIENT ] { 1002 }
@@ -189,6 +191,10 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Constant [ int SWOOLE_ERROR_CO_PROTECT_STACK_FAILED ] { 10012 }
Constant [ int SWOOLE_ERROR_CO_STD_THREAD_LINK_ERROR ] { 10013 }
Constant [ int SWOOLE_ERROR_CO_DISABLED_MULTI_THREAD ] { 10014 }
+ Constant [ int SWOOLE_ERROR_CO_CANNOT_CANCEL ] { 10015 }
+ Constant [ int SWOOLE_ERROR_CO_NOT_EXISTS ] { 10016 }
+ Constant [ int SWOOLE_ERROR_CO_CANCELED ] { 10017 }
+ Constant [ int SWOOLE_ERROR_CO_TIMEDOUT ] { 10018 }
Constant [ int SWOOLE_TRACE_SERVER ] { 2 }
Constant [ int SWOOLE_TRACE_CLIENT ] { 4 }
Constant [ int SWOOLE_TRACE_BUFFER ] { 8 }
@@ -203,7 +209,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Constant [ int SWOOLE_TRACE_EOF_PROTOCOL ] { 4096 }
Constant [ int SWOOLE_TRACE_LENGTH_PROTOCOL ] { 8192 }
Constant [ int SWOOLE_TRACE_CLOSE ] { 16384 }
- Constant [ int SWOOLE_TRACE_WEBSOCEKT ] { 32768 }
+ Constant [ int SWOOLE_TRACE_WEBSOCKET ] { 32768 }
Constant [ int SWOOLE_TRACE_REDIS_CLIENT ] { 65536 }
Constant [ int SWOOLE_TRACE_MYSQL_CLIENT ] { 131072 }
Constant [ int SWOOLE_TRACE_HTTP_CLIENT ] { 262144 }
@@ -218,7 +224,8 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Constant [ int SWOOLE_TRACE_CO_HTTP_SERVER ] { 134217728 }
Constant [ int SWOOLE_TRACE_TABLE ] { 268435456 }
Constant [ int SWOOLE_TRACE_CO_CURL ] { 536870912 }
- Constant [ int SWOOLE_TRACE_ALL ] { 4294967295 }
+ Constant [ int SWOOLE_TRACE_CARES ] { 1073741824 }
+ Constant [ int SWOOLE_TRACE_ALL ] { 9223372036854775807 }
Constant [ int SWOOLE_LOG_DEBUG ] { 0 }
Constant [ int SWOOLE_LOG_TRACE ] { 1 }
Constant [ int SWOOLE_LOG_INFO ] { 2 }
@@ -255,6 +262,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Constant [ int SWOOLE_CHANNEL_OK ] { 0 }
Constant [ int SWOOLE_CHANNEL_TIMEOUT ] { -1 }
Constant [ int SWOOLE_CHANNEL_CLOSED ] { -2 }
+ Constant [ int SWOOLE_CHANNEL_CANCELED ] { -3 }
Constant [ int SWOOLE_HOOK_TCP ] { 2 }
Constant [ int SWOOLE_HOOK_UDP ] { 4 }
Constant [ int SWOOLE_HOOK_UNIX ] { 8 }
@@ -414,9 +422,10 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
}
Function [ <internal:swoole> function swoole_async_dns_lookup_coro ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> $domain_name ]
Parameter #1 [ <optional> $timeout ]
+ Parameter #2 [ <optional> $type ]
}
}
Function [ <internal:swoole> function swoole_async_set ] {
@@ -724,7 +733,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
}
}
- - Classes [53] {
+ - Classes [52] {
Class [ <internal:swoole> class Swoole\Exception extends Exception implements Throwable ] {
- Constants [0] {
@@ -1381,7 +1390,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Property [ <default> public $workers ]
}
- - Methods [9] {
+ - Methods [11] {
Method [ <internal:swoole, ctor> public method __construct ] {
- Parameters [4] {
@@ -1436,12 +1445,24 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
}
}
+ Method [ <internal:swoole> public method detach ] {
+
+ - Parameters [0] {
+ }
+ }
+
Method [ <internal:swoole> public method start ] {
- Parameters [0] {
}
}
+ Method [ <internal:swoole> public method stop ] {
+
+ - Parameters [0] {
+ }
+ }
+
Method [ <internal:swoole> public method shutdown ] {
- Parameters [0] {
@@ -1450,7 +1471,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
}
}
- Class [ <internal:swoole> <iterateable> class Swoole\Table implements Iterator, Traversable, ArrayAccess, Countable ] {
+ Class [ <internal:swoole> <iterateable> class Swoole\Table implements Iterator, Traversable, Countable ] {
- Constants [3] {
Constant [ public int TYPE_INT ] { 1 }
@@ -1469,7 +1490,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Property [ <default> public $memorySize ]
}
- - Methods [24] {
+ - Methods [20] {
Method [ <internal:swoole, ctor> public method __construct ] {
- Parameters [2] {
@@ -1579,36 +1600,13 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
}
}
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetExists ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $offset ]
- }
- }
-
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetGet ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $offset ]
- }
- }
-
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetSet ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $offset ]
- Parameter #1 [ <required> $value ]
- }
- }
-
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetUnset ] {
+ Method [ <internal:swoole, prototype Iterator> public method rewind ] {
- - Parameters [1] {
- Parameter #0 [ <required> $offset ]
+ - Parameters [0] {
}
}
- Method [ <internal:swoole, prototype Iterator> public method rewind ] {
+ Method [ <internal:swoole, prototype Iterator> public method valid ] {
- Parameters [0] {
}
@@ -1631,66 +1629,6 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
- Parameters [0] {
}
}
-
- Method [ <internal:swoole, prototype Iterator> public method valid ] {
-
- - Parameters [0] {
- }
- }
- }
- }
-
- Class [ <internal:swoole> class Swoole\Table\Row implements ArrayAccess ] {
-
- - Constants [0] {
- }
-
- - Static properties [0] {
- }
-
- - Static methods [0] {
- }
-
- - Properties [2] {
- Property [ <default> public $key ]
- Property [ <default> public $value ]
- }
-
- - Methods [5] {
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetExists ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $offset ]
- }
- }
-
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetGet ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $offset ]
- }
- }
-
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetSet ] {
-
- - Parameters [2] {
- Parameter #0 [ <required> $offset ]
- Parameter #1 [ <required> $value ]
- }
- }
-
- Method [ <internal:swoole, prototype ArrayAccess> public method offsetUnset ] {
-
- - Parameters [1] {
- Parameter #0 [ <required> $offset ]
- }
- }
-
- Method [ <internal:swoole, dtor> public method __destruct ] {
-
- - Parameters [0] {
- }
- }
}
}
@@ -1978,7 +1916,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
- Static properties [0] {
}
- - Static methods [35] {
+ - Static methods [37] {
Method [ <internal:swoole> static public method create ] {
- Parameters [2] {
@@ -2020,6 +1958,19 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
}
}
+ Method [ <internal:swoole> static public method cancel ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <required> $cid ]
+ }
+ }
+
+ Method [ <internal:swoole> static public method isCanceled ] {
+
+ - Parameters [0] {
+ }
+ }
+
Method [ <internal:swoole> static public method suspend ] {
- Parameters [0] {
@@ -2125,9 +2076,10 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Method [ <internal:swoole> static public method dnsLookup ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> $domain_name ]
Parameter #1 [ <optional> $timeout ]
+ Parameter #2 [ <optional> $type ]
}
}
@@ -2716,9 +2668,10 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Method [ <internal:swoole> static public method dnsLookup ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> $domain_name ]
Parameter #1 [ <optional> $timeout ]
+ Parameter #2 [ <optional> $type ]
}
}
@@ -6474,7 +6427,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
- Static methods [0] {
}
- - Properties [16] {
+ - Properties [17] {
Property [ <default> private $onConnect ]
Property [ <default> private $onReceive ]
Property [ <default> private $onClose ]
@@ -6485,6 +6438,7 @@ Extension [ <persistent> extension #118 swoole version 4.6.7 ] {
Property [ <default> private $onHandShake ]
Property [ <default> private $onOpen ]
Property [ <default> private $onMessage ]
+ Property [ <default> private $onDisconnect ]
Property [ <default> public $host ]
Property [ <default> public $port ]
Property [ <default> public $type ]
diff --git a/php-pecl-swoole4.spec b/php-pecl-swoole4.spec
index 18061a6..2160d67 100644
--- a/php-pecl-swoole4.spec
+++ b/php-pecl-swoole4.spec
@@ -18,16 +18,17 @@
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name swoole
# After 20-sockets, 20-json and 20-mysqlnd
-%global ini_name 40-%{pecl_name}.ini
+%global ini_name 40-%{pecl_name}.ini
-%global with_nghttpd2 1
+%bcond_without cares
+%bcond_without nghttpd2
%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
-%global with_brotli 1
+%bcond_without brotli
%else
-%global with_brotli 0
+%bcond_with brotli
%endif
-%global upstream_version 4.6.7
+%global upstream_version 4.7.0
#global upstream_prever RC2
@@ -54,7 +55,10 @@ BuildRequires: pcre-devel
BuildRequires: openssl-devel >= 1.0.2
BuildRequires: zlib-devel
BuildRequires: libcurl-devel
-%if %{with_brotli}
+%if %{with cares}
+BuildRequires: c-ares-devel
+%endif
+%if %{with brotli}
BuildRequires: brotli-devel
%endif
@@ -100,6 +104,9 @@ Obsoletes: php74-pecl-%{pecl_name} <= %{version}
%if "%{php_version}" > "8.0"
Obsoletes: php80-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "8.1"
+Obsoletes: php81-pecl-%{pecl_name} <= %{version}
+%endif
%endif
@@ -197,6 +204,9 @@ peclbuild() {
--enable-mysqlnd \
--enable-swoole-json \
--enable-swoole-curl \
+%if %{with cares}
+ --enable-cares \
+%endif
--with-libdir=%{_lib} \
--with-php-config=$1
@@ -320,6 +330,9 @@ cd ../ZTS
%changelog
+* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 4.7.0-1
+- update to 4.7.0
+
* Sun May 16 2021 Remi Collet <remi@remirepo.net> - 4.6.7-1
- update to 4.6.7