Skip to content

Commit 8b11260

Browse files
huanghantaohuanghantao
authored
Update version for Swoole 4.5.5 (#3734)
1 parent 6d01461 commit 8b11260

File tree

8 files changed

+44
-40
lines changed

8 files changed

+44
-40
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.5.5-alpha)
4+
SET(SWOOLE_VERSION 4.5.5)
55

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

‎include/swoole_version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#define SWOOLE_MAJOR_VERSION 4
2222
#define SWOOLE_MINOR_VERSION 5
2323
#define SWOOLE_RELEASE_VERSION 5
24-
#define SWOOLE_EXTRA_VERSION "alpha"
25-
#define SWOOLE_VERSION "4.5.5-alpha"
24+
#define SWOOLE_EXTRA_VERSION ""
25+
#define SWOOLE_VERSION "4.5.5"
2626
#define SWOOLE_VERSION_ID 40505
2727
#define SWOOLE_API_VERSION_ID 0x202009a
2828

‎package.xml‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
<email>[email protected]</email>
4343
<active>yes</active>
4444
</developer>
45-
<date>2020-09-15</date>
46-
<time>19:00:00</time>
45+
<date>2020-10-13</date>
46+
<time>11:00:00</time>
4747
<version>
48-
<release>4.5.4</release>
48+
<release>4.5.5</release>
4949
<api>4.0</api>
5050
</version>
5151
<stability>
@@ -54,38 +54,31 @@
5454
</stability>
5555
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
5656
<notes>
57-
Backward compatibility Break
58-
---
59-
* Modify SWOOLE_HOOK_ALL to contain SWOOlE_HOOK_CURL (#3606) (@matyhtf)
60-
* Enable SWOOLE_HOOK_ALL by default (#3607) (@matyhtf)
61-
* Remove ssl_method and Support ssl_protocols (#3639) (@Yurunsoft)
62-
6357
New APIs
6458
---
65-
+ Added firstKey and lastKey (swoole/library#51) (@sy-records)
59+
+ Added Process\Manager and alias Process\ProcessManager (swoole/library#eac1ac5) (@matyhtf)
60+
+ Support HTTP2 server-side GOAWAY (#3710) (@doubaokun)
61+
+ Added Co\map() function (swoole/library#57) (@leocavalcante)
6662

6763
Enhancement
6864
---
69-
+ Added open_websocket_ping_frame, open_websocket_pong_frame (#3600) (@Yurunsoft)
65+
+ Support http2 client unix socket (#3668) (@sy-records)
66+
+ Set the worker status to SW_WORKER_EXIT when the worker process exits (#3724) (@matyhtf)
67+
+ Add send_queued_bytes and recv_queued_bytes in Server::getClientInfo() (#3721) (#3731) (@matyhtf) (@Yurunsoft)
68+
+ Support option of stats_file (#3725) (@matyhtf) (@Yurunsoft)
7069

7170
Fixed
7271
---
73-
* Fixed fseek ftell file larger than 2G bug (#3619) (@Yurunsoft)
74-
* Fixed Socket barrier bug (#3627) (@matyhtf)
75-
* Fixed http proxy handshake bug (#3630) (@matyhtf)
76-
* Fixed a problem with parsing the HTTP header when send chunk data (#3633) (@matyhtf)
77-
* Fixed zend_hash_clean assertion failure (#3634) (@twose)
78-
* Fixed can't remove broken fd from event loop (#3650) (@matyhtf)
79-
* Fixed crash when receiving invalid packet (#3653) (@matyhtf)
80-
* Fixed array_key_last (swoole/library#46) (@sy-records)
72+
* Fixed PHP8 build (zend_compile_string change) (#3670) (@twose)
73+
* Fixed PHP8 build (ext/sockets compatibility) (#3684) (@twose)
74+
* Fixed PHP8 build (php_url_encode_hash_ex change) (#3713) (@remicollet)
75+
* Fixed invalid conversion from 'const char*' to 'char*' for build (#3686) (@remicollet)
76+
* Fixed HTTP2 client over HTTP proxy is not working (#3677) (@matyhtf) (@twose)
77+
* Fixed PDO context data confusion (swoole/library#54) (@sy-records)
8178

8279
Kernel
8380
---
84-
* Code optimization (#3615) (#3617) (#3622) (#3635) (#3640) (#3641) (#3642) (#3645) (#3658) (@matyhtf)
85-
* Reduce unnecessary memory operation to improve write performance (#3620) (@matyhtf)
86-
* Refactor aio (#3624) (@Yurunsoft)
87-
* Added readlink/opendir/readdir/closedir hook (#3628) (@matyhtf)
88-
* Improve swMutex_create, add SW_MUTEX_ROBUST (#3646) (@matyhtf)
81+
* Code optimization (#3671) (#3689) (#3700) (#3701) (#3708) (#3718) (#3722) (#3723) (@matyhtf)
8982
</notes>
9083
<contents>
9184
<dir name="/">
@@ -128,6 +121,7 @@
128121
<file role="src" name="core-tests/src/core/log.cpp" />
129122
<file role="src" name="core-tests/src/core/string.cpp" />
130123
<file role="src" name="core-tests/src/core/time.cpp" />
124+
<file role="src" name="core-tests/src/core/wheel_timer.cpp" />
131125
<file role="src" name="core-tests/src/coroutine/async.cpp" />
132126
<file role="src" name="core-tests/src/coroutine/base.cpp" />
133127
<file role="src" name="core-tests/src/coroutine/channel.cpp" />
@@ -497,8 +491,6 @@
497491
<file role="doc" name="examples/websocket/client.html" />
498492
<file role="doc" name="examples/websocket/client.php" />
499493
<file role="doc" name="examples/websocket/server.php" />
500-
<file role="doc" name="examples/wrapper/CMakeLists.txt" />
501-
<file role="doc" name="examples/wrapper/server.cpp" />
502494
<file role="doc" name="examples/www/dir1/file1.txt" />
503495
<file role="doc" name="examples/www/dir1/file2.txt" />
504496
<file role="doc" name="examples/www/dir2/file1.txt" />
@@ -549,7 +541,6 @@
549541
<file role="src" name="include/swoole_proxy.h" />
550542
<file role="src" name="include/swoole_reactor.h" />
551543
<file role="src" name="include/swoole_redis.h" />
552-
<file role="src" name="include/swoole_ring_queue.h" />
553544
<file role="src" name="include/swoole_server.h" />
554545
<file role="src" name="include/swoole_signal.h" />
555546
<file role="src" name="include/swoole_socket.h" />
@@ -562,6 +553,7 @@
562553
<file role="src" name="include/swoole_util.h" />
563554
<file role="src" name="include/swoole_version.h" />
564555
<file role="src" name="include/swoole_websocket.h" />
556+
<file role="src" name="include/swoole_wheel_timer.h" />
565557
<file role="src" name="make.sh" />
566558
<file role="src" name="mascot.png" />
567559
<file role="src" name="php_swoole.cc" />
@@ -584,7 +576,6 @@
584576
<file role="src" name="src/core/error.cc" />
585577
<file role="src" name="src/core/heap.cc" />
586578
<file role="src" name="src/core/log.cc" />
587-
<file role="src" name="src/core/ring_queue.cc" />
588579
<file role="src" name="src/core/string.cc" />
589580
<file role="src" name="src/core/timer.cc" />
590581
<file role="src" name="src/coroutine/base.cc" />
@@ -1065,6 +1056,7 @@
10651056
<file role="test" name="tests/swoole_http2_client_coro/goaway.phpt" />
10661057
<file role="test" name="tests/swoole_http2_client_coro/headers.phpt" />
10671058
<file role="test" name="tests/swoole_http2_client_coro/host.phpt" />
1059+
<file role="test" name="tests/swoole_http2_client_coro/http_proxy.phpt" />
10681060
<file role="test" name="tests/swoole_http2_client_coro/huge_headers.phpt" />
10691061
<file role="test" name="tests/swoole_http2_client_coro/issues_2374.phpt" />
10701062
<file role="test" name="tests/swoole_http2_client_coro/multi.phpt" />
@@ -1076,9 +1068,11 @@
10761068
<file role="test" name="tests/swoole_http2_client_coro/send-cookies.phpt" />
10771069
<file role="test" name="tests/swoole_http2_client_coro/send_only_bug.phpt" />
10781070
<file role="test" name="tests/swoole_http2_client_coro/set-cookies.phpt" />
1071+
<file role="test" name="tests/swoole_http2_client_coro/sock_type_unix.phpt" />
10791072
<file role="test" name="tests/swoole_http2_client_coro/wrong_headers.phpt" />
10801073
<file role="test" name="tests/swoole_http2_server/big_data.phpt" />
10811074
<file role="test" name="tests/swoole_http2_server/compression.phpt" />
1075+
<file role="test" name="tests/swoole_http2_server/goaway.phpt" />
10821076
<file role="test" name="tests/swoole_http2_server/nghttp2_big_data.phpt" />
10831077
<file role="test" name="tests/swoole_http2_server/no_compression.phpt" />
10841078
<file role="test" name="tests/swoole_http2_server/ping.phpt" />
@@ -1347,6 +1341,8 @@
13471341
<file role="test" name="tests/swoole_mysql_coro/z_reset.phpt" />
13481342
<file role="test" name="tests/swoole_process/alarm.phpt" />
13491343
<file role="test" name="tests/swoole_process/coro/ipc.phpt" />
1344+
<file role="test" name="tests/swoole_process/coro/set_protocol.phpt" />
1345+
<file role="test" name="tests/swoole_process/coro/signal.phpt" />
13501346
<file role="test" name="tests/swoole_process/coro/start.phpt" />
13511347
<file role="test" name="tests/swoole_process/daemon.phpt" />
13521348
<file role="test" name="tests/swoole_process/echo.py" />
@@ -1550,6 +1546,7 @@
15501546
<file role="test" name="tests/swoole_server/event/manager_stop.phpt" />
15511547
<file role="test" name="tests/swoole_server/event/shutdown.phpt" />
15521548
<file role="test" name="tests/swoole_server/event/start.phpt" />
1549+
<file role="test" name="tests/swoole_server/event/worker_exit.phpt" />
15531550
<file role="test" name="tests/swoole_server/exist.phpt" />
15541551
<file role="test" name="tests/swoole_server/force_reload.phpt" />
15551552
<file role="test" name="tests/swoole_server/force_reload2.phpt" />
@@ -1566,16 +1563,20 @@
15661563
<file role="test" name="tests/swoole_server/heartbeat_with_base.phpt" />
15671564
<file role="test" name="tests/swoole_server/idle_worekr_num.phpt" />
15681565
<file role="test" name="tests/swoole_server/invalid_fd.phpt" />
1566+
<file role="test" name="tests/swoole_server/invalid_option.phpt" />
15691567
<file role="test" name="tests/swoole_server/kill_user_process_01.phpt" />
15701568
<file role="test" name="tests/swoole_server/kill_user_process_02.phpt" />
15711569
<file role="test" name="tests/swoole_server/kill_worker_01.phpt" />
15721570
<file role="test" name="tests/swoole_server/kill_worker_02.phpt" />
1571+
<file role="test" name="tests/swoole_server/last_time.phpt" />
15731572
<file role="test" name="tests/swoole_server/length/00.phpt" />
15741573
<file role="test" name="tests/swoole_server/length/01.phpt" />
15751574
<file role="test" name="tests/swoole_server/length/02.phpt" />
15761575
<file role="test" name="tests/swoole_server/length/03.phpt" />
15771576
<file role="test" name="tests/swoole_server/length/length_func.phpt" />
15781577
<file role="test" name="tests/swoole_server/listen_fail.phpt" />
1578+
<file role="test" name="tests/swoole_server/max_idle_time_1.phpt" />
1579+
<file role="test" name="tests/swoole_server/max_idle_time_2.phpt" />
15791580
<file role="test" name="tests/swoole_server/max_queued_bytes.phpt" />
15801581
<file role="test" name="tests/swoole_server/max_request.phpt" />
15811582
<file role="test" name="tests/swoole_server/max_request_grace_disabled.phpt" />
@@ -1631,8 +1632,10 @@
16311632
<file role="test" name="tests/swoole_server/ssl/verify_03.phpt" />
16321633
<file role="test" name="tests/swoole_server/start_twice.phpt" />
16331634
<file role="test" name="tests/swoole_server/stats.phpt" />
1635+
<file role="test" name="tests/swoole_server/stats_file.phpt" />
16341636
<file role="test" name="tests/swoole_server/stop.phpt" />
16351637
<file role="test" name="tests/swoole_server/stop_in_workerStart.phpt" />
1638+
<file role="test" name="tests/swoole_server/systemd_fds.phpt" />
16361639
<file role="test" name="tests/swoole_server/task/base.phpt" />
16371640
<file role="test" name="tests/swoole_server/task/bug_2585.phpt" />
16381641
<file role="test" name="tests/swoole_server/task/callback_is_null.phpt" />
@@ -1721,6 +1724,8 @@
17211724
<file role="test" name="tests/swoole_table/bug_2263.phpt" />
17221725
<file role="test" name="tests/swoole_table/bug_2290.phpt" />
17231726
<file role="test" name="tests/swoole_table/foreach.phpt" />
1727+
<file role="test" name="tests/swoole_table/get_after_destroy.phpt" />
1728+
<file role="test" name="tests/swoole_table/get_before_create.phpt" />
17241729
<file role="test" name="tests/swoole_table/incr_after_del.phpt" />
17251730
<file role="test" name="tests/swoole_table/int.phpt" />
17261731
<file role="test" name="tests/swoole_table/key_value.phpt" />
@@ -1905,6 +1910,7 @@
19051910
<file role="src" name="tools/export.php" />
19061911
<file role="src" name="tools/gen-data.php" />
19071912
<file role="src" name="tools/get-ip-info.php" />
1913+
<file role="src" name="tools/option-generator.php" />
19081914
<file role="src" name="tools/pecl-package.php" />
19091915
<file role="src" name="tools/phpt-fixer.php" />
19101916
<file role="src" name="tools/rename.php" />

‎php_swoole_library.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Generated by build-library.php, Please DO NOT modify!
33
*/
44

5-
/* $Id: 2da2a0ddfe99ae62c3c9f09a244342a90f006c44 */
5+
/* $Id: 0cfa4af0b2ec287cbb3e23aeccbd94d66766c5be */
66

77
static const char* swoole_library_source_constants =
88
"\n"
@@ -437,6 +437,8 @@ static const char* swoole_library_source_core_constant =
437437
"\n"
438438
" public const OPTION_OPEN_REDIS_PROTOCOL = 'open_redis_protocol';\n"
439439
"\n"
440+
" public const OPTION_MAX_IDLE_TIME = 'max_idle_time';\n"
441+
"\n"
440442
" public const OPTION_TCP_KEEPIDLE = 'tcp_keepidle';\n"
441443
"\n"
442444
" public const OPTION_TCP_KEEPINTERVAL = 'tcp_keepinterval';\n"
@@ -6727,7 +6729,7 @@ static const char* swoole_library_source_core_server_helper =
67276729
" $stats = $server->stats();\n"
67286730
" $lines = [];\n"
67296731
" foreach ($stats as $k => $v) {\n"
6730-
" $lines[] = \"$k: $v\";\n"
6732+
" $lines[] = \"{$k}: {$v}\";\n"
67316733
" }\n"
67326734
" $out = implode(\"\\n\", $lines);\n"
67336735
" file_put_contents($server->setting['stats_file'], $out);\n"
@@ -6743,8 +6745,8 @@ static const char* swoole_library_source_core_server_helper =
67436745
" }\n"
67446746
" }\n"
67456747
"\n"
6746-
" public static function onWorkerStop(Server $server, int $workerId) {\n"
6747-
"\n"
6748+
" public static function onWorkerStop(Server $server, int $workerId)\n"
6749+
" {\n"
67486750
" }\n"
67496751
"}\n";
67506752

‎tests/swoole_http2_client_coro/http_proxy.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ Co\run(function () {
3535
});
3636
?>
3737
--EXPECT--
38-

‎tests/swoole_http2_client_coro/sock_type_unix.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ $pm->childFirst();
6464
$pm->run();
6565
?>
6666
--EXPECT--
67-
DONE
67+
DONE

‎tests/swoole_server/event/worker_exit.phpt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,3 @@ worker exit, id=0, status=3
9191
worker stop
9292
worker start, id=0, status=2
9393
worker stop
94-

‎tests/swoole_server/invalid_option.phpt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,3 @@ Warning: unsupported option [invalid_option] in @swoole-src/library/core/Server/
2727
#0 Swoole\Server\Helper::checkOptions()
2828
#1 Swoole\Server\Port->set()
2929
#2 Swoole\Server->set() called at [%s:%d]
30-
31-

0 commit comments

Comments
 (0)