Skip to content

Commit 9719296

Browse files
twosetwose
committed
Update version for Swoole 4.4.8
1 parent 91a9e03 commit 9719296

18 files changed

+61
-52
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.7)
4+
SET(SWOOLE_VERSION 4.4.8)
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")

‎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 8
110-
#define SWOOLE_EXTRA_VERSION "alpha"
111-
#define SWOOLE_VERSION "4.4.7-alpha"
110+
#define SWOOLE_EXTRA_VERSION ""
111+
#define SWOOLE_VERSION "4.4.8"
112112
#define SWOOLE_VERSION_ID 40408
113113
#define SWOOLE_BUG_REPORT \
114114
"A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"\

‎library/core/Constant.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class Constant
4040
const OPTION_ENABLE_COROUTINE = 'enable_coroutine';
4141
const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';
4242
const OPTION_SSL_METHOD = 'ssl_method';
43+
const OPTION_SSL_PROTOCOLS = 'ssl_protocols';
4344
const OPTION_SSL_COMPRESS = 'ssl_compress';
4445
const OPTION_SSL_CERT_FILE = 'ssl_cert_file';
4546
const OPTION_SSL_KEY_FILE = 'ssl_key_file';
@@ -119,9 +120,9 @@ class Constant
119120
const OPTION_WORKER_NUM = 'worker_num';
120121
const OPTION_MAX_WAIT_TIME = 'max_wait_time';
121122
const OPTION_MAX_CORO_NUM = 'max_coro_num';
122-
const OPTION_SEND_YIELD = 'send_yield';
123123
const OPTION_SEND_TIMEOUT = 'send_timeout';
124124
const OPTION_DISPATCH_MODE = 'dispatch_mode';
125+
const OPTION_SEND_YIELD = 'send_yield';
125126
const OPTION_DISPATCH_FUNC = 'dispatch_func';
126127
const OPTION_LOG_FILE = 'log_file';
127128
const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';
@@ -130,9 +131,6 @@ class Constant
130131
const OPTION_TASK_USE_OBJECT = 'task_use_object';
131132
const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';
132133
const OPTION_TASK_WORKER_NUM = 'task_worker_num';
133-
const OPTION_TRACE_EVENT_WORKER = 'trace_event_worker';
134-
const OPTION_REQUEST_SLOWLOG_TIMEOUT = 'request_slowlog_timeout';
135-
const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';
136134
const OPTION_TASK_IPC_MODE = 'task_ipc_mode';
137135
const OPTION_TASK_TMPDIR = 'task_tmpdir';
138136
const OPTION_TASK_MAX_REQUEST = 'task_max_request';

‎package.xml‎

Lines changed: 37 additions & 30 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>2019-09-25</date>
46-
<time>16:00:00</time>
45+
<date>2019-10-15</date>
46+
<time>20:00:00</time>
4747
<version>
48-
<release>4.4.7</release>
48+
<release>4.4.8</release>
4949
<api>4.0</api>
5050
</version>
5151
<stability>
@@ -54,17 +54,36 @@
5454
</stability>
5555
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
5656
<notes>
57+
Deprecated
58+
---
59+
- Move async Swoole\Client to [ext-async](https://github.com/swoole/ext-async)
60+
5761
Enhancement
5862
---
59-
+ Support thread context (9214411c) (@matyhtf)
60-
+ Generate a warning if the channel has producers or consumers when the program exits (b9f37d9c) (@twose)
63+
+ Support Http\Response close (#2861) (@matyhtf)
64+
+ Support Process::daemon() redirection of IO (#2871) (@matyhtf)
65+
* Add Swoole\Server\Task::pack (#2872) (#2874) (@matyhtf)
66+
+ Support ssl_protocols option (74499276) (@matyhtf)
67+
+ Add document of bug reports (ba1c078f) (@twose)
6168

6269
Fixed
6370
---
64-
* Fixed reactor send bug (a1dc95f5) (@matyhtf)
65-
* Fixed event init bug (907c84b3) (@matyhtf)
66-
* Fixed crash on Cygwin (cfb74793) (@matyhtf)
67-
* Fixed wrong length of string (c4f97993) (@twose)
71+
* Fixed random bytes added to response status code (#2856) (@twose)
72+
* Fixed naming conflicts with php gdbinit (2a2447ec) (@shiguangqi)
73+
* Fixed build without PCRE JIT on OSX (2a4c447e) (@twose)
74+
* Fixed Websocket\Server class entry of property declaration (1f197daf) (@twose)
75+
* Fixed coroutine bound error checker of Co\Http\Client (2619cdd8) (@twose)
76+
* Fixed gdb debugger in docker (ec815288) (@twose)
77+
* Fixed MySQL close error (#2869) (@twose)
78+
* Fixed Cygwin with process (#2868) (#2876) (@matyhtf)
79+
* Fixed tls_host_name not found (d1968c26) (@twose)
80+
* Fixed SSL renegotiation (#2847) (d8b87ebb) (@matyhtf)
81+
* Fixed HTTP2 client empty data (37b12d72) (775aefed) (@twose)
82+
* Fixed send yield hang (#2885) (@matyhtf) (@twose)
83+
* Fixed null fci_cache (#2881) (@twose)
84+
* Fixed server mode on CYGWIN (#2868) (@matyhtf)
85+
* Fixed select null (5e23dd96) (@twose)
86+
* Fixed #2643 #2868 (#2888) (@matyhtf)
6887
</notes>
6988
<contents>
7089
<dir name="/">
@@ -261,6 +280,7 @@
261280
<file role="doc" name="examples/coroutine/util/resume003.php" />
262281
<file role="doc" name="examples/coroutine/waitgroup.php" />
263282
<file role="doc" name="examples/coroutine/websocket/client.php" />
283+
<file role="doc" name="examples/coroutine/websocket/co_server.php" />
264284
<file role="doc" name="examples/coroutine/websocket/server.php" />
265285
<file role="doc" name="examples/cpp/co.cc" />
266286
<file role="doc" name="examples/cpp/mt_co.cc" />
@@ -331,6 +351,7 @@
331351
<file role="doc" name="examples/process/client.php" />
332352
<file role="doc" name="examples/process/client3.php" />
333353
<file role="doc" name="examples/process/close.php" />
354+
<file role="doc" name="examples/process/daemon.php" />
334355
<file role="doc" name="examples/process/echo.py" />
335356
<file role="doc" name="examples/process/exec.php" />
336357
<file role="doc" name="examples/process/func_timeout.php" />
@@ -612,7 +633,6 @@
612633
<file role="src" name="src/server/static_handler.cc" />
613634
<file role="src" name="src/server/task_worker.cc" />
614635
<file role="src" name="src/server/worker.cc" />
615-
<file role="src" name="src/wrapper/client.cc" />
616636
<file role="src" name="src/wrapper/event.cc" />
617637
<file role="src" name="src/wrapper/server.cc" />
618638
<file role="src" name="src/wrapper/timer.cc" />
@@ -783,25 +803,6 @@
783803
<file role="test" name="tests/swoole_channel_coro/push_timeout3.phpt" />
784804
<file role="test" name="tests/swoole_channel_coro/push_timeout4.phpt" />
785805
<file role="test" name="tests/swoole_channel_coro/type.phpt" />
786-
<file role="test" name="tests/swoole_client_async/big_package_memory_leak.phpt" />
787-
<file role="test" name="tests/swoole_client_async/buffer_full.phpt" />
788-
<file role="test" name="tests/swoole_client_async/connect_dns.phpt" />
789-
<file role="test" name="tests/swoole_client_async/connect_refuse.phpt" />
790-
<file role="test" name="tests/swoole_client_async/connect_refuse_udg.phpt" />
791-
<file role="test" name="tests/swoole_client_async/connect_refuse_unix.phpt" />
792-
<file role="test" name="tests/swoole_client_async/connect_timeout.phpt" />
793-
<file role="test" name="tests/swoole_client_async/connect_twice.phpt" />
794-
<file role="test" name="tests/swoole_client_async/eof.phpt" />
795-
<file role="test" name="tests/swoole_client_async/eof_close.phpt" />
796-
<file role="test" name="tests/swoole_client_async/getSocket_bug.phpt" />
797-
<file role="test" name="tests/swoole_client_async/getpeername.phpt" />
798-
<file role="test" name="tests/swoole_client_async/getsockname.phpt" />
799-
<file role="test" name="tests/swoole_client_async/length_protocol.phpt" />
800-
<file role="test" name="tests/swoole_client_async/length_protocol_func.phpt" />
801-
<file role="test" name="tests/swoole_client_async/port_invalid.phpt" />
802-
<file role="test" name="tests/swoole_client_async/sendfile.phpt" />
803-
<file role="test" name="tests/swoole_client_async/sleep_wake.phpt" />
804-
<file role="test" name="tests/swoole_client_async/swoole_client.phpt" />
805806
<file role="test" name="tests/swoole_client_coro/bug_2346.phpt" />
806807
<file role="test" name="tests/swoole_client_coro/close.phpt" />
807808
<file role="test" name="tests/swoole_client_coro/close_in_other_co.phpt" />
@@ -837,6 +838,8 @@
837838
<file role="test" name="tests/swoole_client_coro/timeout.phpt" />
838839
<file role="test" name="tests/swoole_client_coro/udp_client.phpt" />
839840
<file role="test" name="tests/swoole_client_coro/udp_recv_failed.phpt" />
841+
<file role="test" name="tests/swoole_client_coro/unsock_dgram.phpt" />
842+
<file role="test" name="tests/swoole_client_coro/unsock_stream.phpt" />
840843
<file role="test" name="tests/swoole_client_sync/connect_1.phpt" />
841844
<file role="test" name="tests/swoole_client_sync/connect_2.phpt" />
842845
<file role="test" name="tests/swoole_client_sync/connect_3.phpt" />
@@ -854,6 +857,7 @@
854857
<file role="test" name="tests/swoole_client_sync/recv_in_task.phpt" />
855858
<file role="test" name="tests/swoole_client_sync/recv_timeout.phpt" />
856859
<file role="test" name="tests/swoole_client_sync/select.phpt" />
860+
<file role="test" name="tests/swoole_client_sync/select_null.phpt" />
857861
<file role="test" name="tests/swoole_client_sync/send_recv.phpt" />
858862
<file role="test" name="tests/swoole_client_sync/sendfile.phpt" />
859863
<file role="test" name="tests/swoole_client_sync/ssl_recv_timeout.phpt" />
@@ -1037,6 +1041,7 @@
10371041
<file role="test" name="tests/swoole_http2_client_coro/issues_2374.phpt" />
10381042
<file role="test" name="tests/swoole_http2_client_coro/multi.phpt" />
10391043
<file role="test" name="tests/swoole_http2_client_coro/no-gzip.phpt" />
1044+
<file role="test" name="tests/swoole_http2_client_coro/number.phpt" />
10401045
<file role="test" name="tests/swoole_http2_client_coro/ping.phpt" />
10411046
<file role="test" name="tests/swoole_http2_client_coro/post.phpt" />
10421047
<file role="test" name="tests/swoole_http2_client_coro/send-cookies.phpt" />
@@ -1246,6 +1251,7 @@
12461251
<file role="test" name="tests/swoole_mysql_coro/procedure_with_query.phpt" />
12471252
<file role="test" name="tests/swoole_mysql_coro/procedure_with_query_and_prepare.phpt" />
12481253
<file role="test" name="tests/swoole_mysql_coro/query.phpt" />
1254+
<file role="test" name="tests/swoole_mysql_coro/query_multifield.phpt" />
12491255
<file role="test" name="tests/swoole_mysql_coro/query_timeout.phpt" />
12501256
<file role="test" name="tests/swoole_mysql_coro/readonly.phpt" />
12511257
<file role="test" name="tests/swoole_mysql_coro/simple_query.phpt" />
@@ -1261,6 +1267,7 @@
12611267
<file role="test" name="tests/swoole_process/alarm.phpt" />
12621268
<file role="test" name="tests/swoole_process/coro/ipc.phpt" />
12631269
<file role="test" name="tests/swoole_process/coro/start.phpt" />
1270+
<file role="test" name="tests/swoole_process/daemon.phpt" />
12641271
<file role="test" name="tests/swoole_process/echo.py" />
12651272
<file role="test" name="tests/swoole_process/enable_coroutine.phpt" />
12661273
<file role="test" name="tests/swoole_process/exception.phpt" />
@@ -1473,7 +1480,6 @@
14731480
<file role="test" name="tests/swoole_server/reload_async.phpt" />
14741481
<file role="test" name="tests/swoole_server/reload_base.phpt" />
14751482
<file role="test" name="tests/swoole_server/reload_process.phpt" />
1476-
<file role="test" name="tests/swoole_server/request_slowlog.phpt" />
14771483
<file role="test" name="tests/swoole_server/sendMessage.phpt" />
14781484
<file role="test" name="tests/swoole_server/sendMessage_02.phpt" />
14791485
<file role="test" name="tests/swoole_server/send_2.phpt" />
@@ -1519,6 +1525,7 @@
15191525
<file role="test" name="tests/swoole_server/task/task_ipc_mode_2.phpt" />
15201526
<file role="test" name="tests/swoole_server/task/task_ipc_mode_3.phpt" />
15211527
<file role="test" name="tests/swoole_server/task/task_max_request.phpt" />
1528+
<file role="test" name="tests/swoole_server/task/task_pack.phpt" />
15221529
<file role="test" name="tests/swoole_server/task/task_queue.phpt" />
15231530
<file role="test" name="tests/swoole_server/task/task_wait.phpt" />
15241531
<file role="test" name="tests/swoole_server/task/without_onfinish.phpt" />

‎php_swoole_library.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,7 @@ static const char* swoole_library_source_core_constant =
896896
" const OPTION_ENABLE_COROUTINE = 'enable_coroutine';\n"
897897
" const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';\n"
898898
" const OPTION_SSL_METHOD = 'ssl_method';\n"
899+
" const OPTION_SSL_PROTOCOLS = 'ssl_protocols';\n"
899900
" const OPTION_SSL_COMPRESS = 'ssl_compress';\n"
900901
" const OPTION_SSL_CERT_FILE = 'ssl_cert_file';\n"
901902
" const OPTION_SSL_KEY_FILE = 'ssl_key_file';\n"
@@ -975,9 +976,9 @@ static const char* swoole_library_source_core_constant =
975976
" const OPTION_WORKER_NUM = 'worker_num';\n"
976977
" const OPTION_MAX_WAIT_TIME = 'max_wait_time';\n"
977978
" const OPTION_MAX_CORO_NUM = 'max_coro_num';\n"
978-
" const OPTION_SEND_YIELD = 'send_yield';\n"
979979
" const OPTION_SEND_TIMEOUT = 'send_timeout';\n"
980980
" const OPTION_DISPATCH_MODE = 'dispatch_mode';\n"
981+
" const OPTION_SEND_YIELD = 'send_yield';\n"
981982
" const OPTION_DISPATCH_FUNC = 'dispatch_func';\n"
982983
" const OPTION_LOG_FILE = 'log_file';\n"
983984
" const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';\n"
@@ -986,9 +987,6 @@ static const char* swoole_library_source_core_constant =
986987
" const OPTION_TASK_USE_OBJECT = 'task_use_object';\n"
987988
" const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';\n"
988989
" const OPTION_TASK_WORKER_NUM = 'task_worker_num';\n"
989-
" const OPTION_TRACE_EVENT_WORKER = 'trace_event_worker';\n"
990-
" const OPTION_REQUEST_SLOWLOG_TIMEOUT = 'request_slowlog_timeout';\n"
991-
" const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';\n"
992990
" const OPTION_TASK_IPC_MODE = 'task_ipc_mode';\n"
993991
" const OPTION_TASK_TMPDIR = 'task_tmpdir';\n"
994992
" const OPTION_TASK_MAX_REQUEST = 'task_max_request';\n"

‎src/core/error.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ const char* swoole_strerror(int code)
8888
return "Session discard timeout data";
8989
case SW_ERROR_OUTPUT_BUFFER_OVERFLOW:
9090
return "Output buffer overflow";
91+
case SW_ERROR_OUTPUT_SEND_YIELD:
92+
return "Output send yield";
9193
case SW_ERROR_SSL_NOT_READY:
9294
return "SSL not ready";
9395
case SW_ERROR_SSL_CANNOT_USE_SENFILE:
@@ -100,6 +102,8 @@ const char* swoole_strerror(int code)
100102
return "SSL bad client";
101103
case SW_ERROR_SSL_BAD_PROTOCOL:
102104
return "SSL bad protocol";
105+
case SW_ERROR_SSL_RESET:
106+
return "SSL reset";
103107
case SW_ERROR_PACKAGE_LENGTH_TOO_LARGE:
104108
return "Package length too large";
105109
case SW_ERROR_PACKAGE_LENGTH_NOT_FOUND:

‎swoole.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,14 @@ PHP_MINIT_FUNCTION(swoole)
432432
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SESSION_INVALID_ID", SW_ERROR_SESSION_INVALID_ID);
433433
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SESSION_DISCARD_TIMEOUT_DATA", SW_ERROR_SESSION_DISCARD_TIMEOUT_DATA);
434434
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_OUTPUT_BUFFER_OVERFLOW", SW_ERROR_OUTPUT_BUFFER_OVERFLOW);
435+
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_OUTPUT_SEND_YIELD", SW_ERROR_OUTPUT_SEND_YIELD);
435436
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_NOT_READY", SW_ERROR_SSL_NOT_READY);
436437
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_CANNOT_USE_SENFILE", SW_ERROR_SSL_CANNOT_USE_SENFILE);
437438
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_EMPTY_PEER_CERTIFICATE", SW_ERROR_SSL_EMPTY_PEER_CERTIFICATE);
438439
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_VEFIRY_FAILED", SW_ERROR_SSL_VEFIRY_FAILED);
439440
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_BAD_CLIENT", SW_ERROR_SSL_BAD_CLIENT);
440441
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_BAD_PROTOCOL", SW_ERROR_SSL_BAD_PROTOCOL);
442+
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_RESET", SW_ERROR_SSL_RESET);
441443
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_PACKAGE_LENGTH_TOO_LARGE", SW_ERROR_PACKAGE_LENGTH_TOO_LARGE);
442444
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_PACKAGE_LENGTH_NOT_FOUND", SW_ERROR_PACKAGE_LENGTH_NOT_FOUND);
443445
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_DATA_LENGTH_TOO_LARGE", SW_ERROR_DATA_LENGTH_TOO_LARGE);

‎tests/swoole_server/ssl_verify_03.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Server: ssl server verify client failed
2+
swoole_server: ssl server verify client failed
33
--SKIPIF--
44
<?php
55
require __DIR__ . '/../include/skipif.inc';

‎tests/swoole_server/task/kill_01.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Server/task: kill task worker [SWOOLE_BASE]
2+
swoole_server/task: kill task worker [SWOOLE_BASE]
33
--SKIPIF--
44
<?php
55
require __DIR__ . '/../../include/skipif.inc';

‎tests/swoole_server/task/kill_02.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Server/task: kill task worker 01 [SWOOLE_BASE]
2+
swoole_server/task: kill task worker 01 [SWOOLE_BASE]
33
--SKIPIF--
44
<?php
55
require __DIR__ . '/../../include/skipif.inc';

0 commit comments

Comments
 (0)