Skip to content

Commit 1ec3202

Browse files
authored
Update version for Swoole 4.6.7 (#4210)
1 parent 39d2f4e commit 1ec3202

File tree

5 files changed

+33
-11
lines changed

5 files changed

+33
-11
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.6.7-dev)
4+
set(SWOOLE_VERSION 4.6.7)
55

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

ext-src/php_swoole.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,8 @@ PHP_MINIT_FUNCTION(swoole) {
641641
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_INVALID_REQUEST", SW_ERROR_SERVER_INVALID_REQUEST);
642642
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_CONNECT_FAIL", SW_ERROR_SERVER_CONNECT_FAIL);
643643
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_EXIT_TIMEOUT", SW_ERROR_SERVER_WORKER_EXIT_TIMEOUT);
644+
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA", SW_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA);
645+
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_UNPROCESSED_DATA", SW_ERROR_SERVER_WORKER_UNPROCESSED_DATA);
644646
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_CO_OUT_OF_COROUTINE", SW_ERROR_CO_OUT_OF_COROUTINE);
645647
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_CO_HAS_BEEN_BOUND", SW_ERROR_CO_HAS_BEEN_BOUND);
646648
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_CO_HAS_BEEN_DISCARDED", SW_ERROR_CO_HAS_BEEN_DISCARDED);

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 6
2323
#define SWOOLE_RELEASE_VERSION 7
24-
#define SWOOLE_EXTRA_VERSION "dev"
25-
#define SWOOLE_VERSION "4.6.7-dev"
24+
#define SWOOLE_EXTRA_VERSION ""
25+
#define SWOOLE_VERSION "4.6.7"
2626
#define SWOOLE_VERSION_ID 40607
2727
#define SWOOLE_API_VERSION_ID 0x202012a
2828

package.xml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
<email>[email protected]</email>
4949
<active>yes</active>
5050
</developer>
51-
<date>2021-04-22</date>
52-
<time>17:00:00</time>
51+
<date>2021-05-14</date>
52+
<time>16:00:00</time>
5353
<version>
54-
<release>4.6.6</release>
54+
<release>4.6.7</release>
5555
<api>4.0</api>
5656
</version>
5757
<stability>
@@ -62,14 +62,23 @@
6262
<notes>
6363
Enhancement
6464
---
65-
* Sent SIGTERM to the manager process on FreeBSD when master process is dead (#4150) (@devnexen)
66-
* Supported static compilation with PHP (#4153) (@matyhtf)
67-
* Supported SNI for File Wrapper over HTTP proxy (#4158) (@matyhtf)
65+
* Supported call Process::signal() in Manager process and Worker process (#4190) (@matyhtf)
6866

6967
Fixed
7068
---
71-
* Fixed sync-client async connect bugs (#4152) (@matyhtf)
72-
* Fixed native curl multi mem leak (swoole/swoole-src@91bf243) (@matyhtf)
69+
* Fixed signal cannot be registered repeatedly (#4170) (@matyhtf)
70+
* Fixed build on OpenBSD/NetBSD (#4188) (#4194) (@devnexen)
71+
* Fixed Lost onclose event (#4204) (@matyhtf)
72+
* Fixed native curl with Symfony HttpClient (#4208) (@matyhtf)
73+
* Fixed Http\Response::end() always return true (swoole/swoole-src@66fcc35) (@matyhtf)
74+
* Fixed PDOException generated by PDOStatementProxy (swoole/library#104) (@twose)
75+
76+
Kernel
77+
---
78+
* Refactored worker buffer, add msg id for the event data (#4163) (@matyhtf)
79+
* Changed the log level of "Request Entity Too Large" to warning (#4175) (@sy-records)
80+
* Deleted inet_ntoa and inet_aton calls (#4199) (@remicollet)
81+
* Adjusted output_buffer_size value to UINT_MAX (swoole/swoole-src@46ab345) (@matyhtf)
7382
</notes>
7483
<contents>
7584
<dir name="/">
@@ -137,6 +146,7 @@
137146
<file role="src" name="core-tests/src/os/async.cpp" />
138147
<file role="src" name="core-tests/src/os/msg_queue.cpp" />
139148
<file role="src" name="core-tests/src/os/pipe.cpp" />
149+
<file role="src" name="core-tests/src/os/process_pool.cpp" />
140150
<file role="src" name="core-tests/src/os/signal.cpp" />
141151
<file role="src" name="core-tests/src/os/timer.cpp" />
142152
<file role="src" name="core-tests/src/os/wait.cpp" />
@@ -1101,6 +1111,7 @@
11011111
<file role="test" name="tests/swoole_curl/setopt/nobody.phpt" />
11021112
<file role="test" name="tests/swoole_curl/sleep.phpt" />
11031113
<file role="test" name="tests/swoole_curl/ssl/version.phpt" />
1114+
<file role="test" name="tests/swoole_curl/symfony.phpt" />
11041115
<file role="test" name="tests/swoole_curl/template" />
11051116
<file role="test" name="tests/swoole_curl/timer_coredump.phpt" />
11061117
<file role="test" name="tests/swoole_curl/upload/1.phpt" />
@@ -1285,6 +1296,7 @@
12851296
<file role="test" name="tests/swoole_http_server/dispatch_mode_7.phpt" />
12861297
<file role="test" name="tests/swoole_http_server/duplicate_header.phpt" />
12871298
<file role="test" name="tests/swoole_http_server/enable_coroutine.phpt" />
1299+
<file role="test" name="tests/swoole_http_server/error_1203.phpt" />
12881300
<file role="test" name="tests/swoole_http_server/error_413.phpt" />
12891301
<file role="test" name="tests/swoole_http_server/form_data_with_charset.phpt" />
12901302
<file role="test" name="tests/swoole_http_server/head_method.phpt" />
@@ -1445,6 +1457,9 @@
14451457
<file role="test" name="tests/swoole_process/process_push.phpt" />
14461458
<file role="test" name="tests/swoole_process/process_select.phpt" />
14471459
<file role="test" name="tests/swoole_process/signal.phpt" />
1460+
<file role="test" name="tests/swoole_process/signal_in_manager.phpt" />
1461+
<file role="test" name="tests/swoole_process/signal_in_task_worker.phpt" />
1462+
<file role="test" name="tests/swoole_process/signal_twice.phpt" />
14481463
<file role="test" name="tests/swoole_process/swoole_process_close.phpt" />
14491464
<file role="test" name="tests/swoole_process/swoole_process_ctor.phpt" />
14501465
<file role="test" name="tests/swoole_process/swoole_process_deamon.phpt" />
@@ -1634,6 +1649,7 @@
16341649
<file role="test" name="tests/swoole_server/bug_aio.phpt" />
16351650
<file role="test" name="tests/swoole_server/check_callback.phpt" />
16361651
<file role="test" name="tests/swoole_server/check_chunk_total_size.phpt" />
1652+
<file role="test" name="tests/swoole_server/client_close_in_writable_event.phpt" />
16371653
<file role="test" name="tests/swoole_server/close_force.phpt" />
16381654
<file role="test" name="tests/swoole_server/close_in_connect_callback.phpt" />
16391655
<file role="test" name="tests/swoole_server/close_in_master.phpt" />

src/core/error.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ const char *swoole_strerror(int code) {
183183
return "Server connect fail";
184184
case SW_ERROR_SERVER_WORKER_EXIT_TIMEOUT:
185185
return "Server worker exit timeout";
186+
case SW_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA:
187+
return "Server worker abnormal pipe data";
188+
case SW_ERROR_SERVER_WORKER_UNPROCESSED_DATA:
189+
return "Server worker unprocessed data";
186190
case SW_ERROR_CO_OUT_OF_COROUTINE:
187191
return "Coroutine out of coroutine";
188192
case SW_ERROR_CO_HAS_BEEN_BOUND:

0 commit comments

Comments
 (0)