Skip to content

Commit ba72231

Browse files
matyhtfmatyhtf
committed
Merge remote-tracking branch 'origin/4.8.x' into 4.8.x
2 parents c195ff5 + 6de2f05 commit ba72231

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+154
-64
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PROJECT(libswoole)
22

33
ENABLE_LANGUAGE(ASM)
4-
set(SWOOLE_VERSION 4.8.2)
4+
set(SWOOLE_VERSION 4.8.3)
55

66
set(CMAKE_CXX_STANDARD 11)
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

‎ext-src/php_swoole_library.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
+----------------------------------------------------------------------+
1515
*/
1616

17-
/* $Id: 471e0a545312f42c2cfc3004e66d1ff3656bc9bf */
17+
/* $Id: acfe73e33caae4c5d12da7456a261b64b191f588 */
1818

1919
static const char* swoole_library_source_constants =
2020
"\n"
@@ -295,8 +295,6 @@ static const char* swoole_library_source_core_constant =
295295
"\n"
296296
" public const OPTION_STACK_SIZE = 'stack_size';\n"
297297
"\n"
298-
" public const OPTION_NAME_RESOLVER = 'name_resolver';\n"
299-
"\n"
300298
" public const OPTION_DNS_CACHE_EXPIRE = 'dns_cache_expire';\n"
301299
"\n"
302300
" public const OPTION_DNS_CACHE_CAPACITY = 'dns_cache_capacity';\n"
@@ -305,8 +303,6 @@ static const char* swoole_library_source_core_constant =
305303
"\n"
306304
" public const OPTION_RECONNECT = 'reconnect';\n"
307305
"\n"
308-
" public const OPTION_MAX_RETRIES = 'max_retries';\n"
309-
"\n"
310306
" public const OPTION_DEFER = 'defer';\n"
311307
"\n"
312308
" public const OPTION_LOWERCASE_HEADER = 'lowercase_header';\n"
@@ -375,8 +371,6 @@ static const char* swoole_library_source_core_constant =
375371
"\n"
376372
" public const OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';\n"
377373
"\n"
378-
" public const OPTION_WORKER_MAX_CONCURRENCY = 'worker_max_concurrency';\n"
379-
"\n"
380374
" public const OPTION_SEND_TIMEOUT = 'send_timeout';\n"
381375
"\n"
382376
" public const OPTION_DISPATCH_MODE = 'dispatch_mode';\n"

‎include/swoole_version.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
#define SWOOLE_MAJOR_VERSION 4
2222
#define SWOOLE_MINOR_VERSION 8
23-
#define SWOOLE_RELEASE_VERSION 2
23+
#define SWOOLE_RELEASE_VERSION 3
2424
#define SWOOLE_EXTRA_VERSION ""
25-
#define SWOOLE_VERSION "4.8.2"
26-
#define SWOOLE_VERSION_ID 40802
25+
#define SWOOLE_VERSION "4.8.3"
26+
#define SWOOLE_VERSION_ID 40803
2727
#define SWOOLE_API_VERSION_ID 0x202109a
2828

2929
#define SWOOLE_BUG_REPORT \

‎package.xml‎

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
<email>[email protected]</email>
5252
<active>yes</active>
5353
</developer>
54-
<date>2021-11-17</date>
55-
<time>13:00:00</time>
54+
<date>2021-11-29</date>
55+
<time>11:00:00</time>
5656
<version>
57-
<release>4.8.2</release>
57+
<release>4.8.3</release>
5858
<api>4.0</api>
5959
</version>
6060
<stability>
@@ -529,6 +529,8 @@
529529
<file role="src" name="ext-src/swoole_coroutine_system.cc" />
530530
<file role="src" name="ext-src/swoole_curl.cc" />
531531
<file role="src" name="ext-src/swoole_event.cc" />
532+
<file role="src" name="ext-src/swoole_hook_sockets.stub.php" />
533+
<file role="src" name="ext-src/swoole_hook_sockets_arginfo.h" />
532534
<file role="src" name="ext-src/swoole_http2_client_coro.cc" />
533535
<file role="src" name="ext-src/swoole_http2_server.cc" />
534536
<file role="src" name="ext-src/swoole_http_client_coro.cc" />
@@ -731,7 +733,6 @@
731733
<file role="test" name="tests/include/config.php" />
732734
<file role="test" name="tests/include/functions.php" />
733735
<file role="test" name="tests/include/lib/composer.json" />
734-
<file role="test" name="tests/include/lib/composer.lock" />
735736
<file role="test" name="tests/include/lib/src/Assert.php" />
736737
<file role="test" name="tests/include/lib/src/CoServer.php" />
737738
<file role="test" name="tests/include/lib/src/CurlManager.php" />
@@ -777,6 +778,7 @@
777778
<file role="test" name="tests/include/ssl_certs/sni_server_us_key.pem" />
778779
<file role="test" name="tests/init" />
779780
<file role="test" name="tests/new" />
781+
<file role="test" name="tests/php-cs-fixer" />
780782
<file role="test" name="tests/run-tests" />
781783
<file role="test" name="tests/start.sh" />
782784
<file role="test" name="tests/swoole_atomic/atomic.phpt" />
@@ -1087,6 +1089,7 @@
10871089
<file role="test" name="tests/swoole_curl/close_before_resume.phpt" />
10881090
<file role="test" name="tests/swoole_curl/concurrent.phpt" />
10891091
<file role="test" name="tests/swoole_curl/error.phpt" />
1092+
<file role="test" name="tests/swoole_curl/event_exit.phpt" />
10901093
<file role="test" name="tests/swoole_curl/exec_twice.phpt" />
10911094
<file role="test" name="tests/swoole_curl/guzzle.phpt" />
10921095
<file role="test" name="tests/swoole_curl/guzzle/cancel.phpt" />
@@ -1139,6 +1142,7 @@
11391142
<file role="test" name="tests/swoole_curl/setopt/nobody.phpt" />
11401143
<file role="test" name="tests/swoole_curl/sleep.phpt" />
11411144
<file role="test" name="tests/swoole_curl/ssl/version.phpt" />
1145+
<file role="test" name="tests/swoole_curl/symfony-noco.phpt" />
11421146
<file role="test" name="tests/swoole_curl/symfony.phpt" />
11431147
<file role="test" name="tests/swoole_curl/template" />
11441148
<file role="test" name="tests/swoole_curl/timer_coredump.phpt" />
@@ -1641,6 +1645,54 @@
16411645
<file role="test" name="tests/swoole_runtime/set_hook_flags.phpt" />
16421646
<file role="test" name="tests/swoole_runtime/sleep.phpt" />
16431647
<file role="test" name="tests/swoole_runtime/sleep_yield.phpt" />
1648+
<file role="test" name="tests/swoole_runtime/sockets/basic/bug46360.phpt" />
1649+
<file role="test" name="tests/swoole_runtime/sockets/basic/bug49341.phpt" />
1650+
<file role="test" name="tests/swoole_runtime/sockets/basic/bug63000.phpt" />
1651+
<file role="test" name="tests/swoole_runtime/sockets/basic/bug76839.phpt" />
1652+
<file role="test" name="tests/swoole_runtime/sockets/basic/ipv4loop.phpt" />
1653+
<file role="test" name="tests/swoole_runtime/sockets/basic/ipv6_skipif.inc" />
1654+
<file role="test" name="tests/swoole_runtime/sockets/basic/ipv6loop.phpt" />
1655+
<file role="test" name="tests/swoole_runtime/sockets/basic/mcast_helpers.php.inc" />
1656+
<file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv4_recv.phpt" />
1657+
<file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv4_send.phpt" />
1658+
<file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv4_send_error.phpt" />
1659+
<file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv6_recv.phpt" />
1660+
<file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv6_recv_limited.phpt" />
1661+
<file role="test" name="tests/swoole_runtime/sockets/basic/mcast_ipv6_send.phpt" />
1662+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_accept_failure.phpt" />
1663+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_bind.phpt" />
1664+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_clear_error.phpt" />
1665+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_connect_params.phpt" />
1666+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_listen-nobind.phpt" />
1667+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_listen.phpt" />
1668+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_listen_used.phpt" />
1669+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_create_pair.phpt" />
1670+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_getopt.phpt" />
1671+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_getpeername.phpt" />
1672+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_getpeername_ipv4loop.phpt" />
1673+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_getpeername_ipv6loop.phpt" />
1674+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_getsockname.phpt" />
1675+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_listen-wrongparams.phpt" />
1676+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_read_params.phpt" />
1677+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_select-wrongparams-2.phpt" />
1678+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_select.phpt" />
1679+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_select_error.phpt" />
1680+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv4_udp.phpt" />
1681+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_ipv6_udp.phpt" />
1682+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_sentto_recvfrom_unix.phpt" />
1683+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_block-retval.phpt" />
1684+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_nonblock-retval.phpt" />
1685+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_nonblock.phpt" />
1686+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_bindtodevice.phpt" />
1687+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_error_socket_option.phpt" />
1688+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_in6_pktinfo.phpt" />
1689+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_rcvtimeo.phpt" />
1690+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_seolinger.phpt" />
1691+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_set_option_sndtimeo.phpt" />
1692+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_setopt_basic.phpt" />
1693+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_shutdown.phpt" />
1694+
<file role="test" name="tests/swoole_runtime/sockets/basic/socket_strerror.phpt" />
1695+
<file role="test" name="tests/swoole_runtime/sockets/basic/unixloop.phpt" />
16441696
<file role="test" name="tests/swoole_runtime/sockets/error.phpt" />
16451697
<file role="test" name="tests/swoole_runtime/sockets/get_name.phpt" />
16461698
<file role="test" name="tests/swoole_runtime/sockets/nonblock.phpt" />

‎tests/swoole_runtime/sockets/basic/bug46360.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
2-
Bug 46360 - TCP_NODELAY constant (sock_get_option, sock_set_option)
2+
swoole_runtime/sockets/basic: Bug 46360 - TCP_NODELAY constant (sock_get_option, sock_set_option)
33
--SKIPIF--
4+
<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
45
<?php if (!extension_loaded('sockets')) die('skip sockets extension not loaded'); ?>
56
--CREDITS--
67
Florian Anderiasch

‎tests/swoole_runtime/sockets/basic/bug49341.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
2-
Bug #49341: add SO_REUSEPORT support for socket_set_option()
2+
swoole_runtime/sockets/basic: add SO_REUSEPORT support for socket_set_option()
33
--SKIPIF--
4+
<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
45
<?php
56
if (!extension_loaded('sockets')) {
67
die('skip sockets extension not available.');

‎tests/swoole_runtime/sockets/basic/bug63000.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
2-
Bug #63000: Multicast on OSX
2+
swoole_runtime/sockets/basic: Multicast on OSX
33
--SKIPIF--
4+
<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
45
<?php
56
if (!extension_loaded('sockets')) {
67
die('skip sockets extension not available.');

‎tests/swoole_runtime/sockets/basic/bug76839.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
2-
Bug #76839: socket_recvfrom may return an invalid 'from' address on MacOS
2+
swoole_runtime/sockets/basic: socket_recvfrom may return an invalid 'from' address on MacOS
33
--SKIPIF--
4+
<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
45
<?php
56
if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {
67
die('skip not valid for Windows.');

‎tests/swoole_runtime/sockets/basic/ipv4loop.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
2-
IPv4 Loopback test
2+
swoole_runtime/sockets/basic: IPv4 Loopback test
33
--SKIPIF--
4+
<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
45
<?php
56
if (!extension_loaded('sockets')) {
67
die('skip sockets extension not available.');

‎tests/swoole_runtime/sockets/basic/ipv6loop.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
2-
IPv6 Loopback test
2+
swoole_runtime/sockets/basic: IPv6 Loopback test
33
--SKIPIF--
4+
<?php require __DIR__ . '/../../../include/skipif.inc'; ?>
45
<?php
56
if (!extension_loaded('sockets')) {
67
die('skip sockets extension not available.');

0 commit comments

Comments
 (0)