Skip to content

Commit fefe259

Browse files
obiltschnigobiltschnig
committed
Merge branch 'poco-1.13.3'
2 parents 608f511 + bba697a commit fefe259

456 files changed

Lines changed: 19190 additions & 2885 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ lib/
131131
lib64/
132132
pocomsg.h
133133
**/UpgradeLog*.XML
134+
.vs/
135+
vcpkg_installed/
134136

135137
# Eclipse generated files #
136138
###########################
@@ -163,3 +165,7 @@ node_modules
163165
*_vs1[45]0.sln
164166
*_vs1[45]0.vcxproj
165167
*_vs1[45]0.vcxproj.filters
168+
169+
# Debug files #
170+
##############
171+
*.core

‎ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,23 +240,24 @@ template <typename IDType>
240240
IDType ActiveRecord<IDType>::lastInsertID(Poco::Data::Session& session)
241241
{
242242
using namespace Poco::Data::Keywords;
243+
using namespace std::string_literals;
243244

244245
IDType id;
245-
if (session.connector() == "sqlite")
246+
if (Poco::icompare(session.connector(), "sqlite"s) == 0)
246247
{
247248
session
248249
<< "SELECT last_insert_rowid()",
249250
into(id),
250251
now;
251252
}
252-
else if (session.connector() == "PostgreSQL")
253+
else if (Poco::icompare(session.connector(), "postgresql"s) == 0)
253254
{
254255
session
255-
<< "SELECT currval('id_seq')",
256+
<< "SELECT lastval()",
256257
into(id),
257258
now;
258259
}
259-
else if (session.connector() == "MySQL")
260+
else if (Poco::icompare(session.connector(), "mysql"s) == 0)
260261
{
261262
session
262263
<< "SELECT LAST_INSERT_ID()",

‎ActiveRecord/src/Context.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
#include "Poco/ActiveRecord/Context.h"
1616

1717

18+
using namespace std::string_literals;
19+
20+
1821
namespace Poco {
1922
namespace ActiveRecord {
2023

@@ -33,7 +36,7 @@ Context::Context(const std::string& connector, const std::string& connectionStri
3336

3437
StatementPlaceholderProvider::Ptr Context::statementPlaceholderProvider() const
3538
{
36-
if (_session.connector() == "postgresql")
39+
if (Poco::icompare(_session.connector(), "postgresql"s) == 0)
3740
return std::make_unique<PostgresStatementPlaceholderProvider>();
3841
else
3942
return std::make_unique<DefaultStatementPlaceholderProvider>();

‎CHANGELOG‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,37 @@
11
This is the changelog file for the POCO C++ Libraries.
22

33

4+
Release 1.13.3 (2024-04-04)
5+
===========================
6+
7+
Summary of Changes:
8+
9+
This is a bugfix release.
10+
11+
Security Fixes:
12+
13+
- GH #4496 Upgrade bundled libexpat to 2.6.2
14+
15+
Features, Enhancements and Third Party Updates:
16+
17+
- GH #4488 Add Poco::Util::Timer::idle() method to check if timer has any tasks scheduled
18+
- GH #3807 DNS.resolve() should not be sorted in HostEntry::removeDuplicates()
19+
- GH #4515 Upgrade bundled SQLite to 3.45.2
20+
- PR #4517 Optimize Net module for Android
21+
22+
Bug Fixes and Improvements:
23+
24+
- GH #4505 ODBC Unicode wrappers do not check for null length pointers
25+
- GH #4492 Poco::BasicMemoryStreamBuf is missing seekpos()
26+
- GH #4486 DateTimeFormat RFC1036 Sunday name is short (should be long)
27+
- GH #4468 Poco::URI: don't lowercase host part if it's a Unix domain socket
28+
- GH #4450 Error between Poco::ActiveRecord and Poco::Data::PostgreSQL
29+
- GH #4435 SecureStreamSocket is not thread-safe
30+
- GH #4415 SecureSocketImpl::reset shouldn't close socket
31+
- GH #3857 Thread_POSIX.cpp shouldn't convert thread IDs to long
32+
- GH #3725 secure socket receiveTimeout throwing after configured timeout * 2
33+
34+
435
Release 1.13.2 (2024-02-19)
536
===========================
637

@@ -38,7 +69,7 @@ Features and Enhancements:
3869

3970
Bug Fixes and Improvements:
4071

41-
- GH #4443 Upgrade libexpat to 2.6.0
72+
- GH #4443 Upgrade libexpat to 2.6.0
4273
- GH #4425 Unit tests: optional testing of deprecated functionality
4374
- GH #4421 Multiple calls to initializeSSL/uninitializeSSL cause assert failure during certificate validation
4475
- GH #4411 NULL pointer: strategy when setting rotation never in FileChannel

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Data/MySQL AND ENABLE_DATA_MYSQL)
424424
list(APPEND Poco_COMPONENTS "Data/MySQL")
425425
endif()
426426

427-
if(EXISTS ${PROJECT_SOURCE_DIR}/Data/PostgresSQL AND ENABLE_DATA_POSTGRESQL)
428-
list(APPEND Poco_COMPONENTS "Data/PostgresSQL")
427+
if(EXISTS ${PROJECT_SOURCE_DIR}/Data/PostgreSQL AND ENABLE_DATA_POSTGRESQL)
428+
list(APPEND Poco_COMPONENTS "Data/PostgreSQL")
429429
endif()
430430

431431
if(EXISTS ${PROJECT_SOURCE_DIR}/ActiveRecord AND ENABLE_ACTIVERECORD)

‎CONTRIBUTORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ Andrew Auclair
6565
Jochen Sprickerhof
6666
Jesse Hoogervorst
6767
Aron Budea
68+
zhuzeitou

‎CppParser/CppParser.progen‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ vc.project.compiler.include = ..\\Foundation\\include
1111
vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
1212
vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
1313
vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
14+
vc.project.compiler.additionalOptions = /Zc:__cplusplus
1415
vc.solution.create = true
1516
vc.solution.include = testsuite\\TestSuite

‎CppParser/CppParser_vs160.vcxproj‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
</ImportGroup>
159159
<PropertyGroup Label="UserMacros"/>
160160
<PropertyGroup>
161-
<_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
161+
<_ProjectFileVersion>17.0.34714.143</_ProjectFileVersion>
162162
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
163163
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
164164
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
@@ -241,6 +241,7 @@
241241
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
242242
<CompileAs>Default</CompileAs>
243243
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
244+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
244245
<MultiProcessorCompilation>true</MultiProcessorCompilation>
245246
<LanguageStandard>stdcpp17</LanguageStandard>
246247
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -276,6 +277,7 @@
276277
<DebugInformationFormat/>
277278
<CompileAs>Default</CompileAs>
278279
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
280+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
279281
<MultiProcessorCompilation>true</MultiProcessorCompilation>
280282
<LanguageStandard>stdcpp17</LanguageStandard>
281283
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -309,6 +311,7 @@
309311
<WarningLevel>Level3</WarningLevel>
310312
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
311313
<CompileAs>Default</CompileAs>
314+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
312315
<MultiProcessorCompilation>true</MultiProcessorCompilation>
313316
<LanguageStandard>stdcpp17</LanguageStandard>
314317
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -337,6 +340,7 @@
337340
<DebugInformationFormat/>
338341
<CompileAs>Default</CompileAs>
339342
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
343+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
340344
<MultiProcessorCompilation>true</MultiProcessorCompilation>
341345
<LanguageStandard>stdcpp17</LanguageStandard>
342346
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -362,6 +366,7 @@
362366
<WarningLevel>Level3</WarningLevel>
363367
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
364368
<CompileAs>Default</CompileAs>
369+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
365370
<MultiProcessorCompilation>true</MultiProcessorCompilation>
366371
<LanguageStandard>stdcpp17</LanguageStandard>
367372
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -390,6 +395,7 @@
390395
<WarningLevel>Level3</WarningLevel>
391396
<DebugInformationFormat/>
392397
<CompileAs>Default</CompileAs>
398+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
393399
<MultiProcessorCompilation>true</MultiProcessorCompilation>
394400
<LanguageStandard>stdcpp17</LanguageStandard>
395401
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -415,6 +421,7 @@
415421
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
416422
<CompileAs>Default</CompileAs>
417423
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
424+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
418425
<MultiProcessorCompilation>true</MultiProcessorCompilation>
419426
<LanguageStandard>stdcpp17</LanguageStandard>
420427
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -450,6 +457,7 @@
450457
<DebugInformationFormat/>
451458
<CompileAs>Default</CompileAs>
452459
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
460+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
453461
<MultiProcessorCompilation>true</MultiProcessorCompilation>
454462
<LanguageStandard>stdcpp17</LanguageStandard>
455463
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -483,6 +491,7 @@
483491
<WarningLevel>Level3</WarningLevel>
484492
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
485493
<CompileAs>Default</CompileAs>
494+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
486495
<MultiProcessorCompilation>true</MultiProcessorCompilation>
487496
<LanguageStandard>stdcpp17</LanguageStandard>
488497
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -511,6 +520,7 @@
511520
<DebugInformationFormat/>
512521
<CompileAs>Default</CompileAs>
513522
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
523+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
514524
<MultiProcessorCompilation>true</MultiProcessorCompilation>
515525
<LanguageStandard>stdcpp17</LanguageStandard>
516526
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -536,6 +546,7 @@
536546
<WarningLevel>Level3</WarningLevel>
537547
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
538548
<CompileAs>Default</CompileAs>
549+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
539550
<MultiProcessorCompilation>true</MultiProcessorCompilation>
540551
<LanguageStandard>stdcpp17</LanguageStandard>
541552
<LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -564,6 +575,7 @@
564575
<DebugInformationFormat/>
565576
<CompileAs>Default</CompileAs>
566577
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
578+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
567579
<MultiProcessorCompilation>true</MultiProcessorCompilation>
568580
<LanguageStandard>stdcpp17</LanguageStandard>
569581
<LanguageStandard_C>stdc11</LanguageStandard_C>

‎CppParser/CppParser_vs160.vcxproj.filters‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<Filter Include="CppParser">
5-
<UniqueIdentifier>{78ecda8b-38b1-4bed-932f-02ebe18f2b52}</UniqueIdentifier>
5+
<UniqueIdentifier>{3f6c284e-682e-4160-b268-c5e241a22f53}</UniqueIdentifier>
66
</Filter>
77
<Filter Include="CppParser\Header Files">
8-
<UniqueIdentifier>{b38335e1-d932-4eec-ba2a-4a50fb8eef30}</UniqueIdentifier>
8+
<UniqueIdentifier>{4a314797-3b7a-4be6-a2d2-d6affc8f8ba4}</UniqueIdentifier>
99
</Filter>
1010
<Filter Include="CppParser\Source Files">
11-
<UniqueIdentifier>{2415ef0b-be5f-4f5e-a150-f6e13a8d2a02}</UniqueIdentifier>
11+
<UniqueIdentifier>{f173d6f4-7788-4167-9d72-12304345efe9}</UniqueIdentifier>
1212
</Filter>
1313
<Filter Include="Symbol Table">
14-
<UniqueIdentifier>{0d1aa205-1f5e-48d3-8f67-71125f193a0c}</UniqueIdentifier>
14+
<UniqueIdentifier>{5ad87ecc-a1e5-4089-b431-dba34da5ddd0}</UniqueIdentifier>
1515
</Filter>
1616
<Filter Include="Symbol Table\Header Files">
17-
<UniqueIdentifier>{406ad7af-4bef-4dbb-acc7-9abc8d0977cc}</UniqueIdentifier>
17+
<UniqueIdentifier>{b8da7b3a-2d02-4d3c-8999-043e3e9ec721}</UniqueIdentifier>
1818
</Filter>
1919
<Filter Include="Symbol Table\Source Files">
20-
<UniqueIdentifier>{41388393-2d90-46aa-90de-24d4186cc3af}</UniqueIdentifier>
20+
<UniqueIdentifier>{83dbfcbd-3d03-41d9-bc4b-fb5702eb9409}</UniqueIdentifier>
2121
</Filter>
2222
<Filter Include="Attributes">
23-
<UniqueIdentifier>{8afc7c3a-be7c-460c-9d74-8af0fab90754}</UniqueIdentifier>
23+
<UniqueIdentifier>{d2f1ddcc-5e75-412d-b53c-8d2206a696ca}</UniqueIdentifier>
2424
</Filter>
2525
<Filter Include="Attributes\Header Files">
26-
<UniqueIdentifier>{36ac1f5a-6d4c-46e6-be3e-16cadb0a20dc}</UniqueIdentifier>
26+
<UniqueIdentifier>{a95afa6a-d706-456f-96b3-204bdc2b865b}</UniqueIdentifier>
2727
</Filter>
2828
<Filter Include="Attributes\Source Files">
29-
<UniqueIdentifier>{e31474cf-8e07-4bbe-8bb1-d3a4a6156cfe}</UniqueIdentifier>
29+
<UniqueIdentifier>{4577fd4b-16d1-46f6-9e0c-2602534ff286}</UniqueIdentifier>
3030
</Filter>
3131
</ItemGroup>
3232
<ItemGroup>

0 commit comments

Comments
 (0)