Version 5.0.2 (#4966)

swoole · Feb 6, 2023 · 6809ae4 · 6809ae4
1 parent 3c6ff57
commit 6809ae4
Show file tree

Hide file tree

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

diff --git a/ext-src/php_swoole_library.h b/ext-src/php_swoole_library.h
@@ -14,7 +14,7 @@
  +----------------------------------------------------------------------+
  */
 
-/* $Id: 70a8531dc7f61e3519e7c115357b01d585acc3f9 */
+/* $Id: b5d133b336d05162c94acd7f31e444afe47fb96a */
 
 #ifndef SWOOLE_LIBRARY_H
 #define SWOOLE_LIBRARY_H
@@ -239,6 +239,18 @@ static const char* swoole_library_source_core_constant =
  "\n"
  " public const OPTION_SOCKET_TIMEOUT = 'socket_timeout';\n"
  "\n"
+ " public const OPTION_HTTP2_HEADER_TABLE_SIZE = 'http2_header_table_size';\n"
+ "\n"
+ " public const OPTION_HTTP2_ENABLE_PUSH = 'http2_enable_push';\n"
+ "\n"
+ " public const OPTION_HTTP2_MAX_CONCURRENT_STREAMS = 'http2_max_concurrent_streams';\n"
+ "\n"
+ " public const OPTION_HTTP2_INIT_WINDOW_SIZE = 'http2_init_window_size';\n"
+ "\n"
+ " public const OPTION_HTTP2_MAX_FRAME_SIZE = 'http2_max_frame_size';\n"
+ "\n"
+ " public const OPTION_HTTP2_MAX_HEADER_LIST_SIZE = 'http2_max_header_list_size';\n"
+ "\n"
  " public const OPTION_AIO_CORE_WORKER_NUM = 'aio_core_worker_num';\n"
  "\n"
  " public const OPTION_AIO_WORKER_NUM = 'aio_worker_num';\n"
@@ -339,20 +351,6 @@ static const char* swoole_library_source_core_constant =
  "\n"
  " public const OPTION_HTTP_PROXY_PASSWORD = 'http_proxy_password';\n"
  "\n"
- " public const OPTION_TIMEOUT = 'timeout';\n"
- "\n"
- " public const OPTION_CONNECT_TIMEOUT = 'connect_timeout';\n"
- "\n"
- " public const OPTION_READ_TIMEOUT = 'read_timeout';\n"
- "\n"
- " public const OPTION_WRITE_TIMEOUT = 'write_timeout';\n"
- "\n"
- " public const OPTION_SSL_DISABLE_COMPRESSION = 'ssl_disable_compression';\n"
- "\n"
- " public const OPTION_SSL_ECDH_CURVE = 'ssl_ecdh_curve';\n"
- "\n"
- " public const OPTION_SSL_GREASE = 'ssl_grease';\n"
- "\n"
  " public const OPTION_MAX_CORO_NUM = 'max_coro_num';\n"
  "\n"
  " public const OPTION_MAX_COROUTINE = 'max_coroutine';\n"
@@ -375,6 +373,10 @@ static const char* swoole_library_source_core_constant =
  "\n"
  " public const OPTION_MAX_CONCURRENCY = 'max_concurrency';\n"
  "\n"
+ " public const OPTION_CONNECT_TIMEOUT = 'connect_timeout';\n"
+ "\n"
+ " public const OPTION_TIMEOUT = 'timeout';\n"
+ "\n"
  " public const OPTION_MAX_RETRIES = 'max_retries';\n"
  "\n"
  " public const OPTION_DEFER = 'defer';\n"
@@ -577,6 +579,8 @@ static const char* swoole_library_source_core_constant =
  "\n"
  " public const OPTION_SSL_PREFER_SERVER_CIPHERS = 'ssl_prefer_server_ciphers';\n"
  "\n"
+ " public const OPTION_SSL_ECDH_CURVE = 'ssl_ecdh_curve';\n"
+ "\n"
  " public const OPTION_SSL_DHPARAM = 'ssl_dhparam';\n"
  "\n"
  " public const OPTION_SSL_SNI_CERTS = 'ssl_sni_certs';\n"
@@ -585,6 +589,14 @@ static const char* swoole_library_source_core_constant =
  "\n"
  " public const OPTION_OPEN_FASTCGI_PROTOCOL = 'open_fastcgi_protocol';\n"
  "\n"
+ " public const OPTION_READ_TIMEOUT = 'read_timeout';\n"
+ "\n"
+ " public const OPTION_WRITE_TIMEOUT = 'write_timeout';\n"
+ "\n"
+ " public const OPTION_SSL_DISABLE_COMPRESSION = 'ssl_disable_compression';\n"
+ "\n"
+ " public const OPTION_SSL_GREASE = 'ssl_grease';\n"
+ "\n"
  " public const OPTION_EXIT_CONDITION = 'exit_condition';\n"
  "\n"
  " public const OPTION_DEADLOCK_CHECK_DISABLE_TRACE = 'deadlock_check_disable_trace';\n"

diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -21,8 +21,8 @@
 #define SWOOLE_MAJOR_VERSION 5
 #define SWOOLE_MINOR_VERSION 0
 #define SWOOLE_RELEASE_VERSION 2
-#define SWOOLE_EXTRA_VERSION "dev"
-#define SWOOLE_VERSION "5.0.2-dev"
+#define SWOOLE_EXTRA_VERSION ""
+#define SWOOLE_VERSION "5.0.2"
 #define SWOOLE_VERSION_ID 50002
 #define SWOOLE_API_VERSION_ID 0x202208a
 

diff --git a/package.xml b/package.xml
diff --git a/tests/swoole_http_server_coro/graceful_shutdown.phpt b/tests/swoole_http_server_coro/graceful_shutdown.phpt
@@ -53,4 +53,4 @@ $pm->run();
 index
 shutdown
 sleep
-done
+done
diff --git a/tests/swoole_http_server_coro/restart.phpt b/tests/swoole_http_server_coro/restart.phpt
@@ -45,4 +45,4 @@ $pm->run();
 [1]index
 [1]shutdown
 [0]index
-[0]shutdown
+[0]shutdown
diff --git a/tests/swoole_pgsql_coro/bug_4911.phpt b/tests/swoole_pgsql_coro/bug_4911.phpt
@@ -25,4 +25,3 @@ FATAL: database "test123123" does not exist
 FATAL: password authentication failed for user "root123"
 
 fe_sendauth: no password supplied
-
diff --git a/tools/code-generator.php b/tools/code-generator.php
@@ -63,7 +63,7 @@
 // generate ERROR strings
 $swoole_error_cc = ROOT_DIR . '/src/core/error.cc';
 $swoole_error_cc_content = file_get_contents($swoole_error_cc);
-$swstrerror_output = space(4) . "switch(code) {\n";
+$swstrerror_output = space(4) . "switch (code) {\n";
 foreach ($matches_error[0] as $match) {
  // convert error code to swstrerror
  $sw_error_str = implode(' ', explode('_', strtolower(str_replace('SW_ERROR_', '', $match))));