Skip to content

Commit fd143a8

Browse files
v6.1.2 release (#5912)
1 parent b5c0470 commit fd143a8

File tree

3 files changed

+29
-23
lines changed

3 files changed

+29
-23
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
22
project(libswoole)
33

44
enable_language(ASM)
5-
set(SWOOLE_VERSION 6.1.2-dev)
5+
set(SWOOLE_VERSION 6.1.2)
66

77
set(CMAKE_CXX_STANDARD 14)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)

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 6
2222
#define SWOOLE_MINOR_VERSION 1
2323
#define SWOOLE_RELEASE_VERSION 2
24-
#define SWOOLE_EXTRA_VERSION "dev"
25-
#define SWOOLE_VERSION "6.1.2-dev"
24+
#define SWOOLE_EXTRA_VERSION ""
25+
#define SWOOLE_VERSION "6.1.2"
2626
#define SWOOLE_VERSION_ID 60102
2727
#define SWOOLE_API_VERSION_ID 0x202208a
2828

package.xml

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
<email>[email protected]</email>
5050
<active>yes</active>
5151
</developer>
52-
<date>2025-10-30</date>
53-
<time>22:00:00</time>
52+
<date>2025-11-11</date>
53+
<time>23:00:00</time>
5454
<version>
55-
<release>6.1.1</release>
55+
<release>6.1.2</release>
5656
<api>6.0</api>
5757
</version>
5858
<stability>
@@ -61,13 +61,13 @@
6161
</stability>
6262
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
6363
<notes>
64-
🐛 Bug Fixes
65-
- Fixed a compilation failure caused by missing `zlib` dependency.
66-
- Optimized the resource management logic in the `curl` module to prevent use-after-free risks.
67-
- Resolved the absence of `fdatasync` on macOS systems.
68-
69-
🛠️ Kernel Optimizations
70-
- Improved the log output format for coroutine deadlock detection.
64+
- No longer throw warnings when failing to set the `socket` receive/send buffer size
65+
- Fixed an issue in `Swoole\Http\Server` where the `onClose` callback might execute before `onRequest` when handling `HTTP2` requests, leading to a use-after-free problem
66+
- Optimized the `getSocket()` method by duplicating the file descriptor when exporting the `php sockets` resource object, preventing `php sockets` from affecting the `socket` held by `Swoole` upon closure
67+
- Fixed a memory leak issue in `Swoole\Async\Client`
68+
- Fixed an issue where `Swoole\Coroutine\Http\Client` of `IPv6` type could not use `Socks5` proxy
69+
- Synchronized updates to adapt to relevant changes in the `CURL` extension in `PHP 8.4`
70+
- Added the `async.file://` file protocol, which allows enabling coroutine scheduling for specific file operations even when global file coroutine support is disabled
7171
</notes>
7272
<contents>
7373
<dir name="/">
@@ -1326,6 +1326,12 @@
13261326
<file role="test" name="tests/swoole_curl/guzzle/send_async.phpt" />
13271327
<file role="test" name="tests/swoole_curl/https.phpt" />
13281328
<file role="test" name="tests/swoole_curl/keepalive.phpt" />
1329+
<file role="test" name="tests/swoole_curl/multi/1.phpt" />
1330+
<file role="test" name="tests/swoole_curl/multi/2.phpt" />
1331+
<file role="test" name="tests/swoole_curl/multi/3.phpt" />
1332+
<file role="test" name="tests/swoole_curl/multi/4.phpt" />
1333+
<file role="test" name="tests/swoole_curl/multi/5.phpt" />
1334+
<file role="test" name="tests/swoole_curl/multi/6.phpt" />
13291335
<file role="test" name="tests/swoole_curl/multi/add_after_easy_exec.phpt" />
13301336
<file role="test" name="tests/swoole_curl/multi/bug4393.phpt" />
13311337
<file role="test" name="tests/swoole_curl/multi/bug48203_multi.phpt" />
@@ -1334,6 +1340,7 @@
13341340
<file role="test" name="tests/swoole_curl/multi/bug76675.phpt" />
13351341
<file role="test" name="tests/swoole_curl/multi/bug77535.phpt" />
13361342
<file role="test" name="tests/swoole_curl/multi/bug77946.phpt" />
1343+
<file role="test" name="tests/swoole_curl/multi/close.phpt" />
13371344
<file role="test" name="tests/swoole_curl/multi/curl_basic_018.phpt" />
13381345
<file role="test" name="tests/swoole_curl/multi/curl_copy_handle_variation4.phpt" />
13391346
<file role="test" name="tests/swoole_curl/multi/curl_int_cast.phpt" />
@@ -1347,18 +1354,13 @@
13471354
<file role="test" name="tests/swoole_curl/multi/curl_multi_segfault.phpt" />
13481355
<file role="test" name="tests/swoole_curl/multi/curl_multi_select_basic1.phpt" />
13491356
<file role="test" name="tests/swoole_curl/multi/curl_multi_setopt_basic001.phpt" />
1357+
<file role="test" name="tests/swoole_curl/multi/dtor.phpt" />
13501358
<file role="test" name="tests/swoole_curl/multi/multiple_binding.phpt" />
13511359
<file role="test" name="tests/swoole_curl/multi/no_hook.phpt" />
1352-
<file role="test" name="tests/swoole_curl/multi_1.phpt" />
1353-
<file role="test" name="tests/swoole_curl/multi_2.phpt" />
1354-
<file role="test" name="tests/swoole_curl/multi_3.phpt" />
1355-
<file role="test" name="tests/swoole_curl/multi_4.phpt" />
1356-
<file role="test" name="tests/swoole_curl/multi_close.phpt" />
1357-
<file role="test" name="tests/swoole_curl/multi_dtor.phpt" />
1360+
<file role="test" name="tests/swoole_curl/multi/select_cancel.phpt" />
1361+
<file role="test" name="tests/swoole_curl/multi/select_timeout.phpt" />
1362+
<file role="test" name="tests/swoole_curl/multi/select_twice.phpt" />
13581363
<file role="test" name="tests/swoole_curl/non_exclusive.phpt" />
1359-
<file role="test" name="tests/swoole_curl/select_cancel.phpt" />
1360-
<file role="test" name="tests/swoole_curl/select_timeout.phpt" />
1361-
<file role="test" name="tests/swoole_curl/select_twice.phpt" />
13621364
<file role="test" name="tests/swoole_curl/setopt/1.phpt" />
13631365
<file role="test" name="tests/swoole_curl/setopt/3.phpt" />
13641366
<file role="test" name="tests/swoole_curl/setopt/4.phpt" />
@@ -1540,6 +1542,7 @@
15401542
<file role="test" name="tests/swoole_http_client_coro/set_basic_auth.phpt" />
15411543
<file role="test" name="tests/swoole_http_client_coro/slow_server.phpt" />
15421544
<file role="test" name="tests/swoole_http_client_coro/socks5_proxy.phpt" />
1545+
<file role="test" name="tests/swoole_http_client_coro/socks5_proxy_ipv6.phpt" />
15431546
<file role="test" name="tests/swoole_http_client_coro/ssl.phpt" />
15441547
<file role="test" name="tests/swoole_http_client_coro/ssl_host_name.phpt" />
15451548
<file role="test" name="tests/swoole_http_client_coro/ssl_verify_peer_1.phpt" />
@@ -1979,6 +1982,7 @@
19791982
<file role="test" name="tests/swoole_runtime/destruct.phpt" />
19801983
<file role="test" name="tests/swoole_runtime/enable_crypto.phpt" />
19811984
<file role="test" name="tests/swoole_runtime/file_hook/a.inc" />
1985+
<file role="test" name="tests/swoole_runtime/file_hook/async_file.phpt" />
19821986
<file role="test" name="tests/swoole_runtime/file_hook/b.inc" />
19831987
<file role="test" name="tests/swoole_runtime/file_hook/bug_4327.phpt" />
19841988
<file role="test" name="tests/swoole_runtime/file_hook/bug_ftell_2g.phpt" />
@@ -1994,7 +1998,9 @@
19941998
<file role="test" name="tests/swoole_runtime/file_hook/lock_sh.phpt" />
19951999
<file role="test" name="tests/swoole_runtime/file_hook/open_basedir.phpt" />
19962000
<file role="test" name="tests/swoole_runtime/file_hook/read.phpt" />
1997-
<file role="test" name="tests/swoole_runtime/file_lock/file_lock_1.phpt" />
2001+
<file role="test" name="tests/swoole_runtime/file_hook/readdir.phpt" />
2002+
<file role="test" name="tests/swoole_runtime/file_lock/async_file.phpt" />
2003+
<file role="test" name="tests/swoole_runtime/file_lock/lock_ex.phpt" />
19982004
<file role="test" name="tests/swoole_runtime/file_lock/lock_nb.phpt" />
19992005
<file role="test" name="tests/swoole_runtime/file_lock/lock_sh_1.phpt" />
20002006
<file role="test" name="tests/swoole_runtime/get_hook_flags.phpt" />

0 commit comments

Comments
 (0)