Skip to content

Update version for Swoole 4.6.7 #4210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROJECT(libswoole)

ENABLE_LANGUAGE(ASM)
set(SWOOLE_VERSION 4.6.7-dev)
set(SWOOLE_VERSION 4.6.7)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
Expand Down
2 changes: 2 additions & 0 deletions ext-src/php_swoole.cc
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,8 @@ PHP_MINIT_FUNCTION(swoole) {
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_INVALID_REQUEST", SW_ERROR_SERVER_INVALID_REQUEST);
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_CONNECT_FAIL", SW_ERROR_SERVER_CONNECT_FAIL);
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_EXIT_TIMEOUT", SW_ERROR_SERVER_WORKER_EXIT_TIMEOUT);
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA", SW_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA);
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_UNPROCESSED_DATA", SW_ERROR_SERVER_WORKER_UNPROCESSED_DATA);
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_CO_OUT_OF_COROUTINE", SW_ERROR_CO_OUT_OF_COROUTINE);
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_CO_HAS_BEEN_BOUND", SW_ERROR_CO_HAS_BEEN_BOUND);
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_CO_HAS_BEEN_DISCARDED", SW_ERROR_CO_HAS_BEEN_DISCARDED);
Expand Down
4 changes: 2 additions & 2 deletions include/swoole_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#define SWOOLE_MAJOR_VERSION 4
#define SWOOLE_MINOR_VERSION 6
#define SWOOLE_RELEASE_VERSION 7
#define SWOOLE_EXTRA_VERSION "dev"
#define SWOOLE_VERSION "4.6.7-dev"
#define SWOOLE_EXTRA_VERSION ""
#define SWOOLE_VERSION "4.6.7"
#define SWOOLE_VERSION_ID 40607
#define SWOOLE_API_VERSION_ID 0x202012a

Expand Down
32 changes: 24 additions & 8 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
<email>[email protected]</email>
<active>yes</active>
</developer>
<date>2021-04-22</date>
<time>17:00:00</time>
<date>2021-05-14</date>
<time>16:00:00</time>
<version>
<release>4.6.6</release>
<release>4.6.7</release>
<api>4.0</api>
</version>
<stability>
Expand All @@ -62,14 +62,23 @@
<notes>
Enhancement
---
* Sent SIGTERM to the manager process on FreeBSD when master process is dead (#4150) (@devnexen)
* Supported static compilation with PHP (#4153) (@matyhtf)
* Supported SNI for File Wrapper over HTTP proxy (#4158) (@matyhtf)
* Supported call Process::signal() in Manager process and Worker process (#4190) (@matyhtf)

Fixed
---
* Fixed sync-client async connect bugs (#4152) (@matyhtf)
* Fixed native curl multi mem leak (swoole/swoole-src@91bf243) (@matyhtf)
* Fixed signal cannot be registered repeatedly (#4170) (@matyhtf)
* Fixed build on OpenBSD/NetBSD (#4188) (#4194) (@devnexen)
* Fixed Lost onclose event (#4204) (@matyhtf)
* Fixed native curl with Symfony HttpClient (#4208) (@matyhtf)
* Fixed Http\Response::end() always return true (swoole/swoole-src@66fcc35) (@matyhtf)
* Fixed PDOException generated by PDOStatementProxy (swoole/library#104) (@twose)

Kernel
---
* Refactored worker buffer, add msg id for the event data (#4163) (@matyhtf)
* Changed the log level of "Request Entity Too Large" to warning (#4175) (@sy-records)
* Deleted inet_ntoa and inet_aton calls (#4199) (@remicollet)
* Adjusted output_buffer_size value to UINT_MAX (swoole/swoole-src@46ab345) (@matyhtf)
</notes>
<contents>
<dir name="/">
Expand Down Expand Up @@ -137,6 +146,7 @@
<file role="src" name="core-tests/src/os/async.cpp" />
<file role="src" name="core-tests/src/os/msg_queue.cpp" />
<file role="src" name="core-tests/src/os/pipe.cpp" />
<file role="src" name="core-tests/src/os/process_pool.cpp" />
<file role="src" name="core-tests/src/os/signal.cpp" />
<file role="src" name="core-tests/src/os/timer.cpp" />
<file role="src" name="core-tests/src/os/wait.cpp" />
Expand Down Expand Up @@ -1101,6 +1111,7 @@
<file role="test" name="tests/swoole_curl/setopt/nobody.phpt" />
<file role="test" name="tests/swoole_curl/sleep.phpt" />
<file role="test" name="tests/swoole_curl/ssl/version.phpt" />
<file role="test" name="tests/swoole_curl/symfony.phpt" />
<file role="test" name="tests/swoole_curl/template" />
<file role="test" name="tests/swoole_curl/timer_coredump.phpt" />
<file role="test" name="tests/swoole_curl/upload/1.phpt" />
Expand Down Expand Up @@ -1285,6 +1296,7 @@
<file role="test" name="tests/swoole_http_server/dispatch_mode_7.phpt" />
<file role="test" name="tests/swoole_http_server/duplicate_header.phpt" />
<file role="test" name="tests/swoole_http_server/enable_coroutine.phpt" />
<file role="test" name="tests/swoole_http_server/error_1203.phpt" />
<file role="test" name="tests/swoole_http_server/error_413.phpt" />
<file role="test" name="tests/swoole_http_server/form_data_with_charset.phpt" />
<file role="test" name="tests/swoole_http_server/head_method.phpt" />
Expand Down Expand Up @@ -1445,6 +1457,9 @@
<file role="test" name="tests/swoole_process/process_push.phpt" />
<file role="test" name="tests/swoole_process/process_select.phpt" />
<file role="test" name="tests/swoole_process/signal.phpt" />
<file role="test" name="tests/swoole_process/signal_in_manager.phpt" />
<file role="test" name="tests/swoole_process/signal_in_task_worker.phpt" />
<file role="test" name="tests/swoole_process/signal_twice.phpt" />
<file role="test" name="tests/swoole_process/swoole_process_close.phpt" />
<file role="test" name="tests/swoole_process/swoole_process_ctor.phpt" />
<file role="test" name="tests/swoole_process/swoole_process_deamon.phpt" />
Expand Down Expand Up @@ -1634,6 +1649,7 @@
<file role="test" name="tests/swoole_server/bug_aio.phpt" />
<file role="test" name="tests/swoole_server/check_callback.phpt" />
<file role="test" name="tests/swoole_server/check_chunk_total_size.phpt" />
<file role="test" name="tests/swoole_server/client_close_in_writable_event.phpt" />
<file role="test" name="tests/swoole_server/close_force.phpt" />
<file role="test" name="tests/swoole_server/close_in_connect_callback.phpt" />
<file role="test" name="tests/swoole_server/close_in_master.phpt" />
Expand Down
4 changes: 4 additions & 0 deletions src/core/error.cc
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ const char *swoole_strerror(int code) {
return "Server connect fail";
case SW_ERROR_SERVER_WORKER_EXIT_TIMEOUT:
return "Server worker exit timeout";
case SW_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA:
return "Server worker abnormal pipe data";
case SW_ERROR_SERVER_WORKER_UNPROCESSED_DATA:
return "Server worker unprocessed data";
case SW_ERROR_CO_OUT_OF_COROUTINE:
return "Coroutine out of coroutine";
case SW_ERROR_CO_HAS_BEEN_BOUND:
Expand Down