Skip to content

Commit 3ff8b7d

Browse files
twosetwose
committed
Update version for Swoole 4.4.13RC1
1 parent e0724a6 commit 3ff8b7d

File tree

5 files changed

+60
-59
lines changed

5 files changed

+60
-59
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.4.13-alpha)
4+
SET(SWOOLE_VERSION 4.4.13RC1)
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")

‎include/swoole.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ int clock_gettime(clock_id_t which_clock, struct timespec *t);
107107
#define SWOOLE_MAJOR_VERSION 4
108108
#define SWOOLE_MINOR_VERSION 4
109109
#define SWOOLE_RELEASE_VERSION 13
110-
#define SWOOLE_EXTRA_VERSION "alpha"
111-
#define SWOOLE_VERSION "4.4.13-alpha"
110+
#define SWOOLE_EXTRA_VERSION "RC1"
111+
#define SWOOLE_VERSION "4.4.13RC1"
112112
#define SWOOLE_VERSION_ID 40413
113113
#define SWOOLE_BUG_REPORT \
114114
"A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"\

‎package.xml‎

Lines changed: 49 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
- multi-process worker
1616
- multi-protocol
1717
- millisecond timer
18-
- built-in http/websocket/http2 server
19-
- coroutine http/websocket client
18+
- built-in tcp/http/websocket/http2 server
19+
- coroutine tcp/http/websocket client
2020
- coroutine mysql client
2121
- coroutine redis client
2222
- coroutine read/write file system
@@ -42,51 +42,54 @@
4242
<email>[email protected]</email>
4343
<active>yes</active>
4444
</developer>
45-
<date>2019-11-04</date>
46-
<time>21:00:00</time>
45+
<date>2019-12-05</date>
46+
<time>19:00:00</time>
4747
<version>
48-
<release>4.4.12</release>
48+
<release>4.4.13RC1</release>
4949
<api>4.0</api>
5050
</version>
5151
<stability>
52-
<release>stable</release>
53-
<api>stable</api>
52+
<release>beta</release>
53+
<api>beta</api>
5454
</stability>
5555
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
5656
<notes>
5757
New API
5858
---
59-
+ Runtime::getHookFlags (#2915) (@limingxinleo)
59+
+ Built-in Connection Pool ([examples](https://github.com/swoole/library/tree/master/examples)) ([doc](https://wiki.swoole.com/wiki/page/p-library.html)) (@twose)
6060

6161
Enhancement
6262
---
63-
+ Support Websocket Compression on client-side (#2937) (@twose)
64-
+ Support compress websocket message by frame (#2937) (@twose)
65-
+ Optimized the detect logical of shortname (#2935) (@sy-records)
66-
+ Better compression handler (Gzip and Brotli) (#2928) (@twose)
67-
+ Reduce memory copy (#2893) (7fc93504) (@hantaohuang) (@twose)
68-
+ Accepted connection will inherit the options of server (#2898) (@twose)
69-
+ Coroutine\Http\Server support HTTP2 protocol now (5479dbc4) (@matyhtf)
70-
+ Automatically add Content-Type header when use sendfile (4e62bc52) (@matyhtf)
71-
+ Compatibility with Zend preloader (Special thanks to PHP team) (#2899) (@twose)
72-
+ Implement RFC-7692 (#2906) (@matyhtf)
73-
+ Support PHP error control operators (#2916) (@twose)
74-
+ Support socket_send_timeout option for sync client (#2919) (@matyhtf)
75-
+ Support NPN (#2900) (@matyhtf)
76-
+ Improve HTTP proxy handshake request (#2922) (@twose)
63+
* Support websocket compression on Coroutine\Http\Server (#2943) (@twose)
64+
* Support CURLOPT_PUT, CURLOPT_INFILE, CURLOPT_INFILESIZE (#2954) (@twose)
65+
* Add error info for bind error (@LeiZhang-Hunter) (@twose) (#2972)
66+
* Update error info if socket call failed (it will not warn anymore if not necessary) (1e9b8cbb) (@twose)
67+
* Make library submodule (@twose)
7768

7869
Fixed
7970
---
80-
* Fixed AIO task num overflow (7038bdc1) (@twose)
81-
* Fixed gdbinit, support get backtrace info of current stack (bd033e56) (@twose)
82-
* Fixed Websocket Compression (ca818657) (@matyhtf)
83-
* Fixed compilation failure caused BrotliDecoder (#2925) (@twose)
84-
* Fixed memory error caused by compressing big data (#2928) (@twose)
85-
* Fixed #2890 (start a Process\Pool without onWorkerStart event) (#2892) (@twose)
86-
* Fixed the bug that close the connection in non-current worker (#2891) (@matyhtf)
87-
* Fixed memory error of create socket failure (2948f10a) (@matyhtf)
88-
* Fixed missing ssl_host_name of HTTPS proxy (#2904) (@twose)
89-
* Fixed CID-1466865 (#2923) (@tutanhamon)
71+
* Fixed gdbinit in docker (missing symbol) (d46dc2d7 (@twose)
72+
* Fixed compression in POST request (#2947) (@twose)
73+
* Fixed compatibility of Websocket->push method (ac7dbcbc) (@twose)
74+
* Fixed $output result inconsistency (Yurunsoft) (#2955)
75+
* Fixed Coroutine::fread (#2958) (@matyhtf)
76+
* Fixed Coroutine\Server can not exit normally #2837 (#2962) (@twose)
77+
* Fixed memory leak in HTTP2\Server (#2964) (@twose)
78+
* Fixed unsafe_event (#2970) (@matyhtf)
79+
* Fixed illegal call after server start (#2977) (@twose)
80+
* Fixed WebSocket\Frame can not enable mask (#2982) (#2983) (@twose)
81+
* Fixed memory leak of Process callback (898894a7) (@twose)
82+
* Fixed case where minfd is never updated (#2985)
83+
* Fixed HTTP2 module is always enable (3925e212) (@twose)
84+
* Fixed HTTP2 context double free (#2987) (f4cdff1b) (@twose)
85+
* Fixed string comparison (#2988) (97c6c425) (9e5eae63) (@twose)
86+
* Fixed HTTP2 pipeline (#2993) (@twose)
87+
* Fixed coroutine context has been destroyed (#2991) (@twose)
88+
89+
Kernel
90+
---
91+
* Refactor swoole_(get|set)_object to the way of extending zend_object (more stable and faster) (#2966) (@twose)
92+
* Support Github Actions (@twose) (@matyhtf)
9093
</notes>
9194
<contents>
9295
<dir name="/">
@@ -99,6 +102,7 @@
99102
<file role="src" name="benchmark/aio.php" />
100103
<file role="src" name="benchmark/benchmark.php" />
101104
<file role="src" name="benchmark/bin/async.php" />
105+
<file role="test" name="benchmark/bin/keep_conn.phpt" />
102106
<file role="src" name="benchmark/bin/sync.php" />
103107
<file role="src" name="benchmark/co_http_client.php" />
104108
<file role="src" name="benchmark/co_http_proxy.php" />
@@ -141,7 +145,6 @@
141145
<file role="src" name="core-tests/samples/CMakeLists.txt" />
142146
<file role="doc" name="core-tests/samples/README.md" />
143147
<file role="src" name="core-tests/samples/s1.cc" />
144-
<file role="src" name="core-tests/server/tcp.php" />
145148
<file role="src" name="core-tests/src/client.cpp" />
146149
<file role="src" name="core-tests/src/coroutine/async.cpp" />
147150
<file role="src" name="core-tests/src/coroutine/base.cpp" />
@@ -285,8 +288,8 @@
285288
<file role="doc" name="examples/coroutine/websocket/client.php" />
286289
<file role="doc" name="examples/coroutine/websocket/co_server.php" />
287290
<file role="doc" name="examples/coroutine/websocket/server.php" />
291+
<file role="doc" name="examples/cpp/Makefile" />
288292
<file role="doc" name="examples/cpp/co.cc" />
289-
<file role="doc" name="examples/cpp/mt_co.cc" />
290293
<file role="doc" name="examples/cpp/test_server.c" />
291294
<file role="doc" name="examples/db_pool.php" />
292295
<file role="doc" name="examples/eof/async_client.php" />
@@ -533,24 +536,6 @@
533536
<file role="src" name="include/wrapper/base.hpp" />
534537
<file role="src" name="include/wrapper/client.hpp" />
535538
<file role="src" name="include/wrapper/server.hpp" />
536-
<file role="doc" name="library/README.md" />
537-
<file role="src" name="library/alias.php" />
538-
<file role="src" name="library/alias_ns.php" />
539-
<file role="src" name="library/config.inc" />
540-
<file role="src" name="library/constants.php" />
541-
<file role="src" name="library/core/ArrayObject.php" />
542-
<file role="src" name="library/core/Constant.php" />
543-
<file role="src" name="library/core/Coroutine/ObjectPool.php" />
544-
<file role="src" name="library/core/Coroutine/Server.php" />
545-
<file role="src" name="library/core/Coroutine/Server/Connection.php" />
546-
<file role="src" name="library/core/Coroutine/WaitGroup.php" />
547-
<file role="src" name="library/core/Curl/Exception.php" />
548-
<file role="src" name="library/core/Curl/Handler.php" />
549-
<file role="src" name="library/core/Http/StatusCode.php" />
550-
<file role="src" name="library/core/StringObject.php" />
551-
<file role="src" name="library/ext/curl.php" />
552-
<file role="src" name="library/functions.php" />
553-
<file role="src" name="library/std/exec.php" />
554539
<file role="src" name="make.sh" />
555540
<file role="src" name="mascot.png" />
556541
<file role="src" name="php_swoole.h" />
@@ -975,6 +960,8 @@
975960
<file role="test" name="tests/swoole_coroutine_server/ssl.phpt" />
976961
<file role="test" name="tests/swoole_coroutine_server/tcp.phpt" />
977962
<file role="test" name="tests/swoole_coroutine_system/aio_thread_num.phpt" />
963+
<file role="test" name="tests/swoole_coroutine_system/fread.phpt" />
964+
<file role="test" name="tests/swoole_coroutine_system/fwrite.phpt" />
978965
<file role="test" name="tests/swoole_coroutine_system/getaddrinfo.phpt" />
979966
<file role="test" name="tests/swoole_coroutine_system/gethostbyname.phpt" />
980967
<file role="test" name="tests/swoole_coroutine_system/gethostbyname_ipv6.phpt" />
@@ -1116,6 +1103,8 @@
11161103
<file role="test" name="tests/swoole_http_server/bug_2608.phpt" />
11171104
<file role="test" name="tests/swoole_http_server/bug_2751.phpt" />
11181105
<file role="test" name="tests/swoole_http_server/bug_2786.phpt" />
1106+
<file role="test" name="tests/swoole_http_server/bug_2947.phpt" />
1107+
<file role="test" name="tests/swoole_http_server/bug_2988.phpt" />
11191108
<file role="test" name="tests/swoole_http_server/bug_get_request_data_after_end.phpt" />
11201109
<file role="test" name="tests/swoole_http_server/callback_new_obj_method.phpt" />
11211110
<file role="test" name="tests/swoole_http_server/callback_new_static_method.phpt" />
@@ -1182,6 +1171,7 @@
11821171
<file role="test" name="tests/swoole_http_server_coro/tcp_nodelay.phpt" />
11831172
<file role="test" name="tests/swoole_http_server_coro/upload.phpt" />
11841173
<file role="test" name="tests/swoole_http_server_coro/websocket.phpt" />
1174+
<file role="test" name="tests/swoole_http_server_coro/websocket_compression.phpt" />
11851175
<file role="test" name="tests/swoole_library/array_object/base.phpt" />
11861176
<file role="test" name="tests/swoole_library/curl/basic/1.phpt" />
11871177
<file role="test" name="tests/swoole_library/curl/basic/10.phpt" />
@@ -1211,15 +1201,19 @@
12111201
<file role="test" name="tests/swoole_library/curl/setopt/filetime_1.phpt" />
12121202
<file role="test" name="tests/swoole_library/curl/setopt/filetime_2.phpt" />
12131203
<file role="test" name="tests/swoole_library/curl/setopt/header_out.phpt" />
1204+
<file role="test" name="tests/swoole_library/curl/setopt/infile.phpt" />
12141205
<file role="test" name="tests/swoole_library/curl/setopt/nobody.phpt" />
12151206
<file role="test" name="tests/swoole_library/curl/ssl/version.phpt" />
12161207
<file role="test" name="tests/swoole_library/curl/template" />
12171208
<file role="test" name="tests/swoole_library/curl/upload/1.phpt" />
12181209
<file role="test" name="tests/swoole_library/curl/upload/curl_testdata1.txt" />
12191210
<file role="test" name="tests/swoole_library/curl/upload/curl_testdata2.txt" />
1211+
<file role="test" name="tests/swoole_library/database/mysqli.phpt" />
1212+
<file role="test" name="tests/swoole_library/database/pdo.phpt" />
1213+
<file role="test" name="tests/swoole_library/database/redis.phpt" />
12201214
<file role="test" name="tests/swoole_library/exec/exec/1.phpt" />
1215+
<file role="test" name="tests/swoole_library/exec/exec/2.phpt" />
12211216
<file role="test" name="tests/swoole_library/exec/shell_exec/1.phpt" />
1222-
<file role="test" name="tests/swoole_library/object_pool/base.phpt" />
12231217
<file role="test" name="tests/swoole_library/string_object/base.phpt" />
12241218
<file role="test" name="tests/swoole_library/wait_group/normal.phpt" />
12251219
<file role="test" name="tests/swoole_library/wait_group/timeout.phpt" />
@@ -1278,6 +1272,7 @@
12781272
<file role="test" name="tests/swoole_process/enable_coroutine.phpt" />
12791273
<file role="test" name="tests/swoole_process/exception.phpt" />
12801274
<file role="test" name="tests/swoole_process/msgq_capacity.phpt" />
1275+
<file role="test" name="tests/swoole_process/null_callback.phpt" />
12811276
<file role="test" name="tests/swoole_process/process_exec.phpt" />
12821277
<file role="test" name="tests/swoole_process/process_msgqueue.phpt" />
12831278
<file role="test" name="tests/swoole_process/process_push.phpt" />
@@ -1756,12 +1751,12 @@
17561751
<file role="src" name="thirdparty/swoole_http_parser.c" />
17571752
<file role="src" name="thirdparty/swoole_http_parser.h" />
17581753
<file role="src" name="tools/arginfo-check.php" />
1754+
<file role="src" name="tools/bootstrap.php" />
17591755
<file role="src" name="tools/build-library.php" />
17601756
<file role="src" name="tools/code-generator.php" />
17611757
<file role="src" name="tools/config-generator.php" />
17621758
<file role="src" name="tools/constant-generator.php" />
17631759
<file role="src" name="tools/export.php" />
1764-
<file role="src" name="tools/functions.php" />
17651760
<file role="src" name="tools/gen-data.php" />
17661761
<file role="src" name="tools/get-ip-info.php" />
17671762
<file role="src" name="tools/pecl-package.php" />

‎swoole_async_coro.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ PHP_FUNCTION(swoole_async_set)
154154
{
155155
SwooleG.reuse_port = 1;
156156
}
157+
else
158+
{
159+
SwooleG.reuse_port = 0;
160+
}
157161
}
158162
#endif
159163
}

‎tools/pecl-package.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ function check_source_ver(string $expect_ver, $source_file)
207207
swoole_error($package);
208208
} else {
209209
$file_name = $matches['filename'];
210-
$file_size = file_size("{$root_dir}/{$file_name}");
211-
swoole_success("Package {$file_name} ({$file_size}) done");
210+
$file_path = "{$root_dir}/{$file_name}";
211+
$file_size = file_size($file_path);
212+
$file_hash = substr(md5_file($file_path), 0, 8);
213+
swoole_success("Package {$file_name} ({$file_size}) ({$file_hash}) done");
212214
}

0 commit comments

Comments
 (0)