Skip to content

Commit 6c384af

Browse files
committed
Update version for Swoole 4.5.0
1 parent f24c0dd commit 6c384af

File tree

4 files changed

+302
-82
lines changed

4 files changed

+302
-82
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.0RC1)
4+
SET(SWOOLE_VERSION 4.5.0)
55
SET(SWOOLE_CLFLAGS pthread rt dl ssl crypt crypto)
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 0
24-
#define SWOOLE_EXTRA_VERSION "RC1"
25-
#define SWOOLE_VERSION "4.5.0RC1"
24+
#define SWOOLE_EXTRA_VERSION ""
25+
#define SWOOLE_VERSION "4.5.0"
2626
#define SWOOLE_VERSION_ID 40500
2727
#define SWOOLE_API_VERSION_ID 0x202003a
2828

package.xml

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
<email>[email protected]</email>
4343
<active>yes</active>
4444
</developer>
45-
<date>2020-04-08</date>
46-
<time>13:00:00</time>
45+
<date>2020-04-26</date>
46+
<time>14:00:00</time>
4747
<version>
48-
<release>4.5.0RC1</release>
48+
<release>4.5.0</release>
4949
<api>4.0</api>
5050
</version>
5151
<stability>
52-
<release>beta</release>
53-
<api>beta</api>
52+
<release>stable</release>
53+
<api>stable</api>
5454
</stability>
5555
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
5656
<notes>
@@ -80,7 +80,16 @@
8080
+ Optimize SSL validation (#3226) (@matyhtf)
8181
+ Separate SSL accept and SSL handshake (#3214) (@twose)
8282
+ Support MIPS (#3196) (@ekongyun)
83+
+ Resolve the domain name when use udp coroutine client (#3236) (#3239) (@huanghantao)
84+
+ Do not close stdout and stderr (show error logs after shutdown) (#3249) (@twose)
85+
+ Support some common options for Coroutine\Http\Server (#3257) (@twose)
86+
+ Support set cookies when websocket handshake (#3270) (#3272) (@twose)
8387
+ Support CURLOPT_FAILONERROR (swoole/library#20) (@sy-records)
88+
+ Support CURLOPT_FAILONERROR (swoole/library#20) (@sy-records)
89+
+ Support CURLOPT_SSLCERTTYPE, CURLOPT_SSLCERT, CURLOPT_SSLKEYTYPE, CURLOPT_SSLKEY (swoole/library#22) (@sy-records)
90+
+ Support CURLOPT_HTTPGET (swoole/library@d730bd08) (@shiguangqi)
91+
+ Compatible with different versions of Redis extension as much as possible (swoole/library#24) (@twose)
92+
+ Disable Cloning of Database Proxy Objects (swoole/library#23) (@deminy)
8493

8594
Remove
8695
---
@@ -106,7 +115,6 @@
106115
Fixed
107116
---
108117
* Fixed `enable_delay_receive` (#3221) (#3224) (@matyhtf)
109-
* Fixed `ConnectionPool->fill` (swoole/library#18) (@NHZEX)
110118
* All other bug fix patches have already been merged into the v4.4.x branch, we will not reiterate them here
111119
</notes>
112120
<contents>
@@ -117,47 +125,6 @@
117125
<file role="doc" name="README-CN.md" />
118126
<file role="doc" name="README.md" />
119127
<file role="doc" name="SUPPORTED.md" />
120-
<file role="src" name="benchmark/ab.sh" />
121-
<file role="src" name="benchmark/aio.php" />
122-
<file role="src" name="benchmark/benchmark.php" />
123-
<file role="src" name="benchmark/bin/async.php" />
124-
<file role="src" name="benchmark/bin/ipc.php" />
125-
<file role="test" name="benchmark/bin/keep_conn.phpt" />
126-
<file role="src" name="benchmark/bin/sync.php" />
127-
<file role="src" name="benchmark/co_http_client.php" />
128-
<file role="src" name="benchmark/co_http_proxy.php" />
129-
<file role="src" name="benchmark/co_switch.go" />
130-
<file role="src" name="benchmark/co_switch.php" />
131-
<file role="src" name="benchmark/co_tcp_proxy.php" />
132-
<file role="src" name="benchmark/composer.json" />
133-
<file role="src" name="benchmark/coroutine.php" />
134-
<file role="src" name="benchmark/http.go" />
135-
<file role="src" name="benchmark/http.js" />
136-
<file role="src" name="benchmark/http2.go" />
137-
<file role="src" name="benchmark/larger_payload.php" />
138-
<file role="src" name="benchmark/main.php" />
139-
<file role="src" name="benchmark/post.big.data" />
140-
<file role="src" name="benchmark/post.data" />
141-
<file role="src" name="benchmark/redis.go" />
142-
<file role="src" name="benchmark/runtime.php" />
143-
<file role="src" name="benchmark/seria_bench.php" />
144-
<file role="src" name="benchmark/server/dtls.php" />
145-
<file role="src" name="benchmark/server/eof_server.php" />
146-
<file role="src" name="benchmark/server/functions.php" />
147-
<file role="src" name="benchmark/server/http.php" />
148-
<file role="src" name="benchmark/server/length_server.php" />
149-
<file role="src" name="benchmark/server/random_data.php" />
150-
<file role="src" name="benchmark/server/random_data_eof.php" />
151-
<file role="src" name="benchmark/server/tcp.php" />
152-
<file role="src" name="benchmark/server/udp.php" />
153-
<file role="src" name="benchmark/server/websocket.php" />
154-
<file role="src" name="benchmark/src/Base.php" />
155-
<file role="src" name="benchmark/src/Command/RunTest.php" />
156-
<file role="src" name="benchmark/stream_mode.php" />
157-
<file role="src" name="benchmark/table.php" />
158-
<file role="src" name="benchmark/tcp.go" />
159-
<file role="src" name="benchmark/tcp.js" />
160-
<file role="src" name="benchmark/timer.php" />
161128
<file role="src" name="clear.sh" />
162129
<file role="src" name="code_stats.sh" />
163130
<file role="src" name="config.m4" />
@@ -170,7 +137,7 @@
170137
<file role="src" name="core-tests/samples/CMakeLists.txt" />
171138
<file role="doc" name="core-tests/samples/README.md" />
172139
<file role="src" name="core-tests/samples/s1.cc" />
173-
<file role="src" name="core-tests/src/client.cpp" />
140+
<file role="src" name="core-tests/src/client/client.cpp" />
174141
<file role="src" name="core-tests/src/coroutine/async.cpp" />
175142
<file role="src" name="core-tests/src/coroutine/base.cpp" />
176143
<file role="src" name="core-tests/src/coroutine/channel.cpp" />
@@ -184,6 +151,7 @@
184151
<file role="src" name="core-tests/src/os/signal.cpp" />
185152
<file role="src" name="core-tests/src/os/wait.cpp" />
186153
<file role="src" name="core-tests/src/pipe.cpp" />
154+
<file role="src" name="core-tests/src/process/process.cpp" />
187155
<file role="src" name="core-tests/src/reactor/base.cpp" />
188156
<file role="src" name="core-tests/src/ringbuffer.cpp" />
189157
<file role="src" name="core-tests/src/server.cpp" />
@@ -812,6 +780,7 @@
812780
<file role="test" name="tests/swoole_channel_coro/chan_stats.phpt" />
813781
<file role="test" name="tests/swoole_channel_coro/close.phpt" />
814782
<file role="test" name="tests/swoole_channel_coro/coro_wait.phpt" />
783+
<file role="test" name="tests/swoole_channel_coro/discard.phpt" />
815784
<file role="test" name="tests/swoole_channel_coro/fibonacci.phpt" />
816785
<file role="test" name="tests/swoole_channel_coro/http2.phpt" />
817786
<file role="test" name="tests/swoole_channel_coro/hybird_chan.phpt" />
@@ -1197,6 +1166,7 @@
11971166
<file role="test" name="tests/swoole_http_server/rawContent.phpt" />
11981167
<file role="test" name="tests/swoole_http_server/rawCookie.phpt" />
11991168
<file role="test" name="tests/swoole_http_server/redirect.phpt" />
1169+
<file role="test" name="tests/swoole_http_server/response_create.phpt" />
12001170
<file role="test" name="tests/swoole_http_server/send_yield.phpt" />
12011171
<file role="test" name="tests/swoole_http_server/sendfile.phpt" />
12021172
<file role="test" name="tests/swoole_http_server/static_handler.phpt" />
@@ -1458,6 +1428,7 @@
14581428
<file role="test" name="tests/swoole_runtime/redis_connect.phpt" />
14591429
<file role="test" name="tests/swoole_runtime/redis_pconnect.phpt" />
14601430
<file role="test" name="tests/swoole_runtime/sento.phpt" />
1431+
<file role="test" name="tests/swoole_runtime/set_hook_flags.phpt" />
14611432
<file role="test" name="tests/swoole_runtime/sleep.phpt" />
14621433
<file role="test" name="tests/swoole_runtime/ssl_client.phpt" />
14631434
<file role="test" name="tests/swoole_runtime/ssl_server.phpt" />
@@ -1550,7 +1521,6 @@
15501521
<file role="test" name="tests/swoole_server/max_request_grace_disabled.phpt" />
15511522
<file role="test" name="tests/swoole_server/max_request_grace_enabled.phpt" />
15521523
<file role="test" name="tests/swoole_server/max_request_threshold.phpt" />
1553-
<file role="test" name="tests/swoole_server/object/getInstance.phpt" />
15541524
<file role="test" name="tests/swoole_server/object/getManagerPid.phpt" />
15551525
<file role="test" name="tests/swoole_server/object/getMasterPid.phpt" />
15561526
<file role="test" name="tests/swoole_server/object/getWorkerId.phpt" />
@@ -1585,8 +1555,12 @@
15851555
<file role="test" name="tests/swoole_server/slow_client.phpt" />
15861556
<file role="test" name="tests/swoole_server/ssl/00.phpt" />
15871557
<file role="test" name="tests/swoole_server/ssl/bad_client.phpt" />
1558+
<file role="test" name="tests/swoole_server/ssl/code/client.go" />
1559+
<file role="test" name="tests/swoole_server/ssl/code/client.js" />
15881560
<file role="test" name="tests/swoole_server/ssl/dtls.phpt" />
15891561
<file role="test" name="tests/swoole_server/ssl/dtls_with_length_protocol.phpt" />
1562+
<file role="test" name="tests/swoole_server/ssl/golang.phpt" />
1563+
<file role="test" name="tests/swoole_server/ssl/nodejs.phpt" />
15901564
<file role="test" name="tests/swoole_server/ssl/verify_01.phpt" />
15911565
<file role="test" name="tests/swoole_server/ssl/verify_02.phpt" />
15921566
<file role="test" name="tests/swoole_server/ssl/verify_03.phpt" />
@@ -1596,6 +1570,7 @@
15961570
<file role="test" name="tests/swoole_server/task/bug_2585.phpt" />
15971571
<file role="test" name="tests/swoole_server/task/callback_is_null.phpt" />
15981572
<file role="test" name="tests/swoole_server/task/enable_coroutine.phpt" />
1573+
<file role="test" name="tests/swoole_server/task/finish_timeout.phpt" />
15991574
<file role="test" name="tests/swoole_server/task/huge_data.phpt" />
16001575
<file role="test" name="tests/swoole_server/task/idle_worekr_num.phpt" />
16011576
<file role="test" name="tests/swoole_server/task/kill_01.phpt" />
@@ -1632,6 +1607,7 @@
16321607
<file role="test" name="tests/swoole_server_coro/reuse_port.phpt" />
16331608
<file role="test" name="tests/swoole_server_coro/ssl.phpt" />
16341609
<file role="test" name="tests/swoole_server_coro/tcp.phpt" />
1610+
<file role="test" name="tests/swoole_server_port/connections.phpt" />
16351611
<file role="test" name="tests/swoole_server_port/duplicate_registered.phpt" />
16361612
<file role="test" name="tests/swoole_server_port/heartbeat.phpt" />
16371613
<file role="test" name="tests/swoole_server_port/http.phpt" />
@@ -1720,6 +1696,7 @@
17201696
<file role="test" name="tests/swoole_websocket_server/recv_decode.phpt" />
17211697
<file role="test" name="tests/swoole_websocket_server/send_encode.phpt" />
17221698
<file role="test" name="tests/swoole_websocket_server/send_encode_async.phpt" />
1699+
<file role="test" name="tests/swoole_websocket_server/set_cookie_on_hanshake.phpt" />
17231700
<file role="test" name="tests/template" />
17241701
<file role="test" name="tests/test.sql" />
17251702
<file role="src" name="thirdparty/boost/asm/combined.S" />

0 commit comments

Comments
 (0)