Update version for Swoole 4.8.0 (#4431)

* Update version for Swoole 4.8.0 * Added release permission * Update package.xml * Added release permission * Revert "Added release permission" This reverts commit 7b62768. * client support ssl_ciphers config (#4432) * Update version for Swoole 4.8.0 Co-authored-by: Bruce Dou <doubaokun@gmail.com> Co-authored-by: matyhtf <mikan.tenny@gmail.com> Co-authored-by: albert <amuluowin@163.com>
swoole · Oct 14, 2021 · ffdb510 · ffdb510
1 parent 0a86985
commit ffdb510
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 40 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 4.7.2-dev)
+set(SWOOLE_VERSION 4.8.0)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

diff --git a/config.m4 b/config.m4
@@ -623,14 +623,14 @@ if test "$PHP_SWOOLE" != "no"; then
         src/server/base.cc \
         src/server/manager.cc \
         src/server/master.cc \
+        src/server/message_bus.cc \
         src/server/port.cc \
         src/server/process.cc \
         src/server/reactor_process.cc \
         src/server/reactor_thread.cc \
         src/server/static_handler.cc \
         src/server/task_worker.cc \
         src/server/worker.cc \
-        src/server/message_bus.cc \
         src/wrapper/event.cc \
         src/wrapper/timer.cc"
 

diff --git a/ext-src/php_swoole_library.h b/ext-src/php_swoole_library.h
@@ -86,6 +86,8 @@ static const char* swoole_library_source_core_constant =
     "    /* {{{ EVENT */\n"
     "    public const EVENT_START = 'start';\n"
     "\n"
+    "    public const EVENT_BEFORE_SHUTDOWN = 'beforeShutdown';\n"
+    "\n"
     "    public const EVENT_SHUTDOWN = 'shutdown';\n"
     "\n"
     "    public const EVENT_WORKER_START = 'workerStart';\n"
@@ -499,6 +501,14 @@ static const char* swoole_library_source_core_constant =
     "\n"
     "    public const OPTION_OPEN_FASTCGI_PROTOCOL = 'open_fastcgi_protocol';\n"
     "\n"
+    "    public const OPTION_EXIT_CONDITION = 'exit_condition';\n"
+    "\n"
+    "    public const OPTION_DEADLOCK_CHECK_DISABLE_TRACE = 'deadlock_check_disable_trace';\n"
+    "\n"
+    "    public const OPTION_DEADLOCK_CHECK_LIMIT = 'deadlock_check_limit';\n"
+    "\n"
+    "    public const OPTION_DEADLOCK_CHECK_DEPTH = 'deadlock_check_depth';\n"
+    "\n"
     "    /* }}} OPTION */\n"
     "}\n";
 

diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -19,12 +19,12 @@
 #define SWOOLE_VERSION_H_
 
 #define SWOOLE_MAJOR_VERSION 4
-#define SWOOLE_MINOR_VERSION 7
-#define SWOOLE_RELEASE_VERSION 2
-#define SWOOLE_EXTRA_VERSION "dev"
-#define SWOOLE_VERSION "4.7.2-dev"
-#define SWOOLE_VERSION_ID 40702
-#define SWOOLE_API_VERSION_ID 0x202109a
+#define SWOOLE_MINOR_VERSION 8
+#define SWOOLE_RELEASE_VERSION 0
+#define SWOOLE_EXTRA_VERSION ""
+#define SWOOLE_VERSION "4.8.0"
+#define SWOOLE_VERSION_ID 40800
+#define SWOOLE_API_VERSION_ID 0x202012a
 
 #define SWOOLE_BUG_REPORT                                                                                              \
     "A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"                                                \

diff --git a/package.xml b/package.xml
diff --git a/tests/swoole_curl/multi/bug4393.phpt b/tests/swoole_curl/multi/bug4393.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_curl: guzzle
+swoole_curl/multi: guzzle
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';

diff --git a/tests/swoole_runtime/file_hook/open_basedir.phpt b/tests/swoole_runtime/file_hook/open_basedir.phpt
@@ -1,5 +1,5 @@
 --TEST--
-support open_basedir config
+swoole_runtime/file_hook: support open_basedir config
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';
@@ -25,4 +25,4 @@ run(function() {
 Warning: mkdir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line 7
 bool(true)
 bool(true)
-bool(true)
+bool(true)
diff --git a/tests/swoole_server/bug_2308.phpt b/tests/swoole_server/bug_2308.phpt
@@ -44,4 +44,3 @@ $pm->childFirst();
 $pm->run();
 ?>
 --EXPECTF--
-