Merge branch 'poco-1.13.3'

pocoproject · Apr 5, 2024 · fefe259 · fefe259
2 parents 608f511 + bba697a
commit fefe259
Show file tree

Hide file tree

Showing 456 changed files with 19,190 additions and 2,885 deletions.
diff --git a/.gitignore b/.gitignore
@@ -131,6 +131,8 @@ lib/
 lib64/
 pocomsg.h
 **/UpgradeLog*.XML
+.vs/
+vcpkg_installed/
 
 # Eclipse generated files #
 ###########################
@@ -163,3 +165,7 @@ node_modules
 *_vs1[45]0.sln
 *_vs1[45]0.vcxproj
 *_vs1[45]0.vcxproj.filters
+
+# Debug files #
+##############
+*.core
diff --git a/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h b/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h
@@ -240,23 +240,24 @@ template <typename IDType>
 IDType ActiveRecord<IDType>::lastInsertID(Poco::Data::Session& session)
 {
 	using namespace Poco::Data::Keywords;
+	using namespace std::string_literals;
 
 	IDType id;
-	if (session.connector() == "sqlite")
+	if (Poco::icompare(session.connector(), "sqlite"s) == 0)
 	{
 		session
 			<< "SELECT last_insert_rowid()",
 			into(id),
 			now;
 	}
-	else if (session.connector() == "PostgreSQL")
+	else if (Poco::icompare(session.connector(), "postgresql"s) == 0)
 	{
 		session
-			<< "SELECT currval('id_seq')",
+			<< "SELECT lastval()",
 			into(id),
 			now;
 	}
-	else if (session.connector() == "MySQL")
+	else if (Poco::icompare(session.connector(), "mysql"s) == 0)
 	{
 		session
 			<< "SELECT LAST_INSERT_ID()",

diff --git a/ActiveRecord/src/Context.cpp b/ActiveRecord/src/Context.cpp
@@ -15,6 +15,9 @@
 #include "Poco/ActiveRecord/Context.h"
 
 
+using namespace std::string_literals;
+
+
 namespace Poco {
 namespace ActiveRecord {
 
@@ -33,7 +36,7 @@ Context::Context(const std::string& connector, const std::string& connectionStri
 
 StatementPlaceholderProvider::Ptr Context::statementPlaceholderProvider() const
 {
-	if (_session.connector() == "postgresql")
+	if (Poco::icompare(_session.connector(), "postgresql"s) == 0)
 		return std::make_unique<PostgresStatementPlaceholderProvider>();
 	else
 		return std::make_unique<DefaultStatementPlaceholderProvider>();

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,37 @@
 This is the changelog file for the POCO C++ Libraries.
 
 
+Release 1.13.3 (2024-04-04)
+===========================
+
+Summary of Changes:
+
+This is a bugfix release.
+
+Security Fixes:
+
+- GH #4496 Upgrade bundled libexpat to 2.6.2
+
+Features, Enhancements and Third Party Updates:
+
+- GH #4488 Add Poco::Util::Timer::idle() method to check if timer has any tasks scheduled
+- GH #3807 DNS.resolve() should not be sorted in HostEntry::removeDuplicates()
+- GH #4515 Upgrade bundled SQLite to 3.45.2
+- PR #4517 Optimize Net module for Android
+
+Bug Fixes and Improvements:
+
+- GH #4505 ODBC Unicode wrappers do not check for null length pointers
+- GH #4492 Poco::BasicMemoryStreamBuf is missing seekpos()
+- GH #4486 DateTimeFormat RFC1036 Sunday name is short (should be long)
+- GH #4468 Poco::URI: don't lowercase host part if it's a Unix domain socket
+- GH #4450 Error between Poco::ActiveRecord and Poco::Data::PostgreSQL
+- GH #4435 SecureStreamSocket is not thread-safe
+- GH #4415 SecureSocketImpl::reset shouldn't close socket
+- GH #3857 Thread_POSIX.cpp shouldn't convert thread IDs to long
+- GH #3725 secure socket receiveTimeout throwing after configured timeout * 2
+
+
 Release 1.13.2 (2024-02-19)
 ===========================
 
@@ -38,7 +69,7 @@ Features and Enhancements:
 
 Bug Fixes and Improvements:
 
-- GH #4443 Upgrade libexpat to 2.6.0 
+- GH #4443 Upgrade libexpat to 2.6.0
 - GH #4425 Unit tests: optional testing of deprecated functionality
 - GH #4421 Multiple calls to initializeSSL/uninitializeSSL cause assert failure during certificate validation
 - GH #4411 NULL pointer: strategy when setting rotation never in FileChannel

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -424,8 +424,8 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Data/MySQL AND ENABLE_DATA_MYSQL)
 	list(APPEND Poco_COMPONENTS "Data/MySQL")
 endif()
 
-if(EXISTS ${PROJECT_SOURCE_DIR}/Data/PostgresSQL AND ENABLE_DATA_POSTGRESQL)
-	list(APPEND Poco_COMPONENTS "Data/PostgresSQL")
+if(EXISTS ${PROJECT_SOURCE_DIR}/Data/PostgreSQL AND ENABLE_DATA_POSTGRESQL)
+	list(APPEND Poco_COMPONENTS "Data/PostgreSQL")
 endif()
 
 if(EXISTS ${PROJECT_SOURCE_DIR}/ActiveRecord AND ENABLE_ACTIVERECORD)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -65,3 +65,4 @@ Andrew Auclair
 Jochen Sprickerhof
 Jesse Hoogervorst
 Aron Budea
+zhuzeitou
diff --git a/CppParser/CppParser.progen b/CppParser/CppParser.progen
@@ -11,5 +11,6 @@ vc.project.compiler.include = ..\\Foundation\\include
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
 vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/CppParser/CppParser_vs160.vcxproj b/CppParser/CppParser_vs160.vcxproj
@@ -158,7 +158,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.34714.143</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
@@ -241,6 +241,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -276,6 +277,7 @@
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -309,6 +311,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -337,6 +340,7 @@
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -362,6 +366,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -390,6 +395,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -415,6 +421,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -450,6 +457,7 @@
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -483,6 +491,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -511,6 +520,7 @@
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -536,6 +546,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -564,6 +575,7 @@
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>

diff --git a/CppParser/CppParser_vs160.vcxproj.filters b/CppParser/CppParser_vs160.vcxproj.filters
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{78ecda8b-38b1-4bed-932f-02ebe18f2b52}</UniqueIdentifier>
+      <UniqueIdentifier>{3f6c284e-682e-4160-b268-c5e241a22f53}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{b38335e1-d932-4eec-ba2a-4a50fb8eef30}</UniqueIdentifier>
+      <UniqueIdentifier>{4a314797-3b7a-4be6-a2d2-d6affc8f8ba4}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{2415ef0b-be5f-4f5e-a150-f6e13a8d2a02}</UniqueIdentifier>
+      <UniqueIdentifier>{f173d6f4-7788-4167-9d72-12304345efe9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{0d1aa205-1f5e-48d3-8f67-71125f193a0c}</UniqueIdentifier>
+      <UniqueIdentifier>{5ad87ecc-a1e5-4089-b431-dba34da5ddd0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{406ad7af-4bef-4dbb-acc7-9abc8d0977cc}</UniqueIdentifier>
+      <UniqueIdentifier>{b8da7b3a-2d02-4d3c-8999-043e3e9ec721}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{41388393-2d90-46aa-90de-24d4186cc3af}</UniqueIdentifier>
+      <UniqueIdentifier>{83dbfcbd-3d03-41d9-bc4b-fb5702eb9409}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{8afc7c3a-be7c-460c-9d74-8af0fab90754}</UniqueIdentifier>
+      <UniqueIdentifier>{d2f1ddcc-5e75-412d-b53c-8d2206a696ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{36ac1f5a-6d4c-46e6-be3e-16cadb0a20dc}</UniqueIdentifier>
+      <UniqueIdentifier>{a95afa6a-d706-456f-96b3-204bdc2b865b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{e31474cf-8e07-4bbe-8bb1-d3a4a6156cfe}</UniqueIdentifier>
+      <UniqueIdentifier>{4577fd4b-16d1-46f6-9e0c-2602534ff286}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>