diff --git a/Makefile b/Makefile index 0692e7985..52ca8b5e8 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ endif ############################################################################## .PHONY = check help all_lib all samples all clean install uninstall uninstall_all build_one -VERSION = 3.6.1-6 +VERSION = 3.6.2 default: build_one acl_master help h: diff --git a/harmony/api9/acl_one/oh-package.json5 b/harmony/api9/acl_one/oh-package.json5 index 5e28606b4..061cd1969 100644 --- a/harmony/api9/acl_one/oh-package.json5 +++ b/harmony/api9/acl_one/oh-package.json5 @@ -1,6 +1,6 @@ { "name": "acl_one", - "version": "1.0.0", + "version": "3.6.2", "description": "Please describe the basic information.", "main": "", "author": "", diff --git a/lib_acl/lib_acl.rc b/lib_acl/lib_acl.rc index 26a802537..5820a9f46 100644 --- a/lib_acl/lib_acl.rc +++ b/lib_acl/lib_acl.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,3 - PRODUCTVERSION 3,6,1,3 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "本库为跨平台的C库，包括了网络通讯，服务器框架等功能" VALUE "FileDescription", "acl 库" - VALUE "FileVersion", "3.6.1.3" + VALUE "FileVersion", "3.6.2.0" VALUE "InternalName", "lib_acl" - VALUE "LegalCopyright", "zsx (C) 2022" + VALUE "LegalCopyright", "zsx (C) 2024" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl 库" - VALUE "ProductVersion", "3, 6, 1, 3" + VALUE "ProductVersion", "3, 6, 2, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/lib_acl_vc2017.rc b/lib_acl/lib_acl_vc2017.rc index 90e81d745..1190e6997 100644 --- a/lib_acl/lib_acl_vc2017.rc +++ b/lib_acl/lib_acl_vc2017.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,3 - PRODUCTVERSION 3,6,1,3 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "本库为跨平台的C库，包括了网络通讯，服务器框架等功能" VALUE "FileDescription", "acl 库" - VALUE "FileVersion", "3.6.1.3" + VALUE "FileVersion", "3.6.2.0" VALUE "InternalName", "lib_acl" - VALUE "LegalCopyright", "zsx (C) 2022" + VALUE "LegalCopyright", "zsx (C) 2024" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl 库" - VALUE "ProductVersion", "3, 6, 1, 3" + VALUE "ProductVersion", "3, 6, 2, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/lib_acl_vc2019.rc b/lib_acl/lib_acl_vc2019.rc index 90e81d745..1190e6997 100644 --- a/lib_acl/lib_acl_vc2019.rc +++ b/lib_acl/lib_acl_vc2019.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,3 - PRODUCTVERSION 3,6,1,3 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "本库为跨平台的C库，包括了网络通讯，服务器框架等功能" VALUE "FileDescription", "acl 库" - VALUE "FileVersion", "3.6.1.3" + VALUE "FileVersion", "3.6.2.0" VALUE "InternalName", "lib_acl" - VALUE "LegalCopyright", "zsx (C) 2022" + VALUE "LegalCopyright", "zsx (C) 2024" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl 库" - VALUE "ProductVersion", "3, 6, 1, 3" + VALUE "ProductVersion", "3, 6, 2, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/lib_acl_vc2022.rc b/lib_acl/lib_acl_vc2022.rc index 90e81d745..1190e6997 100644 --- a/lib_acl/lib_acl_vc2022.rc +++ b/lib_acl/lib_acl_vc2022.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,1,3 - PRODUCTVERSION 3,6,1,3 + FILEVERSION 3,6,2,0 + PRODUCTVERSION 3,6,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "本库为跨平台的C库，包括了网络通讯，服务器框架等功能" VALUE "FileDescription", "acl 库" - VALUE "FileVersion", "3.6.1.3" + VALUE "FileVersion", "3.6.2.0" VALUE "InternalName", "lib_acl" - VALUE "LegalCopyright", "zsx (C) 2022" + VALUE "LegalCopyright", "zsx (C) 2024" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl 库" - VALUE "ProductVersion", "3, 6, 1, 3" + VALUE "ProductVersion", "3, 6, 2, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/src/init/acl_init.c b/lib_acl/src/init/acl_init.c index 9d18c9cd8..e561ce3f0 100644 --- a/lib_acl/src/init/acl_init.c +++ b/lib_acl/src/init/acl_init.c @@ -25,7 +25,7 @@ #include "init.h" -static char *version = "3.6.1-6 20241028-13:45"; +static char *version = "3.6.2 20241031-18:00"; const char *acl_version(void) { diff --git a/lib_fiber/c/src/stdafx.h b/lib_fiber/c/src/stdafx.h index 451f25ea2..19c9c7704 100644 --- a/lib_fiber/c/src/stdafx.h +++ b/lib_fiber/c/src/stdafx.h @@ -55,7 +55,10 @@ #define STRDUP strdup #define GETPID getpid -#define USE_FSTAT_CHECKFD + +// xxx: Don't use fstat to check fd's type, because in CentOS7.2, this maybe +// make the OpenSSL blocked by mutex, and the reason hasn't been got yet. +//#define USE_FSTAT_CHECKFD #elif defined(SYS_WIN) diff --git a/packaging/acl-libs.spec b/packaging/acl-libs.spec index 40f78838c..9dfe2a39f 100644 --- a/packaging/acl-libs.spec +++ b/packaging/acl-libs.spec @@ -1,8 +1,8 @@ -%define release_id 6 +%define release_id 0 Summary: The powerful c/c++ library Name: acl-libs -Version: 3.6.1 +Version: 3.6.2 Release: %{release_id} Group: System/Libs License: LGPL3.0,IBM @@ -45,6 +45,16 @@ rm -rf %{buildroot} %changelog +* Sat Nov 02 2024 shuxin.zheng shuxin.zheng@qq.com 3.6.2-0-20241102.10 +- Feature: Fiber supports io-ruing; +- Feature: Fiber hooks setsockopt to improve IO timeout performance; +- Feature: Fiber supports Qt-UI on windows; +- Feature: Acl supports vc2022 on windows; +- Feature: Acl supports HarmonyOS; +- Feature: Acl supports being built by COSMOCC; +- Optimize: Connection pool has been optimized very much; +- More small features been added and more bugs been corrected. + * Fri Oct 20 2023 shuxin.zheng shuxin.zheng@qq.com 3.6.1-6-20231020.18 - feature: Add support for udp multicast; - bugfix: Fixed one dead loop bugin mqtt_connect.cpp;