Merge branch 'main' into stack-trace

.github/workflows/ci.yml

@@ -254,7 +254,7 @@ jobs:
             make all -s -j4 ARCHFLAGS="-mcpu=cortex-a8 -mfloat-abi=hard -mfpu=neon" TOOL=arm-linux-gnueabihf
 
   macos-clang-make:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - run: brew install [email protected] mysql-client unixodbc libpq
@@ -284,8 +284,8 @@ jobs:
             ./ci/runtests.sh
 
   macos-clang-make-visibility-hidden:
-    # macos-12 runs on Intel CPU
-    runs-on: macos-12
+    # macos-13 runs on Intel CPU
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - run: brew install [email protected] mysql-client unixodbc libpq
@@ -314,9 +314,9 @@ jobs:
             EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF"
             ./ci/runtests.sh
 
-  macos-clang-cmake-openssl-trace:
-    # macos-14 runs on Apple Silicon
-    runs-on: macos-14
+  macos-clang-cmake-openssl:
+    # macos-latest runs on Apple Silicon
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - run: brew install [email protected] mysql-client unixodbc libpq
@@ -341,7 +341,7 @@ jobs:
             ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
 
   macos-clang-cmake-openssl3:
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - run: brew install openssl@3 mysql-client unixodbc libpq
@@ -366,7 +366,7 @@ jobs:
             ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
 
   macos-clang-cmake-openssl3-visibility-hidden:
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - run: brew install openssl@3 mysql-client unixodbc libpq
@@ -391,7 +391,7 @@ jobs:
             ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
 
   macos-clang-make-openssl3-tsan:
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - run: brew install openssl@3
@@ -421,7 +421,7 @@ jobs:
             ./ci/runtests.sh TSAN
 
   macos-clang-make-openssl3-ubsan:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - run: brew install openssl@3 mysql-client unixodbc libpq
@@ -451,7 +451,7 @@ jobs:
             ./ci/runtests.sh
 
   macos-clang-make-openssl3-asan:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - run: brew install openssl@3 mysql-client unixodbc libpq

Data/include/Poco/Data/LOB.h

@@ -63,7 +63,15 @@ class LOB
 	{
 	}
 
-	LOB(const std::basic_string<T>& content):
+	template<typename U = T>
+	LOB(const std::enable_if_t<std::is_same_v<T, U> && std::is_same_v<U, char>, std::string>& content):
+		_pContent(new std::vector<T>(content.begin(), content.end()))
+		/// Creates a LOB from a string.
+	{
+	}
+
+	template<typename U = T>
+	LOB(const std::enable_if_t<std::is_same_v<T, U> && std::is_same_v<U, wchar_t>, std::wstring>& content):
 		_pContent(new std::vector<T>(content.begin(), content.end()))
 		/// Creates a LOB from a string.
 	{

Foundation/CMakeLists.txt

@@ -42,6 +42,7 @@ else()
 	POCO_SOURCES(SRCS pcre2
 		src/pcre2_auto_possess.c
 		src/pcre2_chartables.c
+		src/pcre2_chkdint.c
 		src/pcre2_compile.c
 		src/pcre2_config.c
 		src/pcre2_context.c
@@ -69,12 +70,6 @@ else()
 		src/pcre2_xclass.c
 	)
 
-	# zlib
-	POCO_HEADERS(SRCS zlib
-		include/Poco/zconf.h
-		include/Poco/zlib.h
-	)
-
 	POCO_SOURCES(SRCS zlib
 		src/adler32.c
 		src/compress.c

Foundation/Foundation_vs160.vcxproj

@@ -1047,6 +1047,7 @@
     <ClCompile Include="src\PatternFormatter.cpp" />
     <ClCompile Include="src\pcre2_auto_possess.c" />
     <ClCompile Include="src\pcre2_chartables.c" />
+    <ClCompile Include="src\pcre2_chkdint.c" />
     <ClCompile Include="src\pcre2_compile.c" />
     <ClCompile Include="src\pcre2_config.c" />
     <ClCompile Include="src\pcre2_context.c" />

Foundation/Foundation_vs160.vcxproj.filters

@@ -846,6 +846,9 @@
     <ClCompile Include="src\pcre2_chartables.c">
       <Filter>RegularExpression\PCRE2 Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre2_chkdint.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre2_compile.c">
       <Filter>RegularExpression\PCRE2 Source Files</Filter>
     </ClCompile>

Foundation/Foundation_vs170.vcxproj

@@ -1509,6 +1509,7 @@
     <ClCompile Include="src\PatternFormatter.cpp" />
     <ClCompile Include="src\pcre2_auto_possess.c" />
     <ClCompile Include="src\pcre2_chartables.c" />
+    <ClCompile Include="src\pcre2_chkdint.c" />
     <ClCompile Include="src\pcre2_compile.c" />
     <ClCompile Include="src\pcre2_config.c" />
     <ClCompile Include="src\pcre2_context.c" />

Foundation/Foundation_vs170.vcxproj.filters

@@ -846,6 +846,9 @@
     <ClCompile Include="src\pcre2_chartables.c">
       <Filter>RegularExpression\PCRE2 Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\pcre2_chkdint.c">
+      <Filter>RegularExpression\PCRE2 Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\pcre2_compile.c">
       <Filter>RegularExpression\PCRE2 Source Files</Filter>
     </ClCompile>

Foundation/Makefile

@@ -39,7 +39,7 @@ objects = ArchiveStrategy Ascii ASCIIEncoding AsyncChannel AsyncNotificationCent
 zlib_objects = adler32 compress crc32 deflate \
 	infback inffast inflate inftrees trees zutil
 
-pcre_objects = pcre2_auto_possess pcre2_chartables pcre2_compile pcre2_config \
+pcre_objects = pcre2_auto_possess pcre2_chartables pcre2_chkdint pcre2_compile pcre2_config \
 	pcre2_context pcre2_convert pcre2_dfa_match pcre2_error pcre2_extuni \
 	pcre2_find_bracket pcre2_jit_compile pcre2_maketables pcre2_match \
 	pcre2_match_data pcre2_newline pcre2_ord2utf pcre2_pattern_info \

Foundation/include/Poco/DateTime.h

@@ -52,7 +52,8 @@ class Foundation_API DateTime
 	/// Notes:
 	///   * Zero is a valid year (in accordance with ISO 8601 and astronomical year numbering)
 	///   * Year zero (0) is a leap year
-	///   * Negative years (years preceding 1 BC) are not supported
+	///   * Minimum date/time that can be represented is 12:00:00 UTC Monday, 1 January 4713 BC
+	///    (Julian Day 0, Gregorian -4713-11-24 12:00:00)
 	///
 	/// For more information, please see:
 	///   * http://en.wikipedia.org/wiki/Gregorian_Calendar
@@ -254,6 +255,12 @@ class Foundation_API DateTime
 		/// Returns true if all arguments are valid, false otherwise.
 
 protected:
+	void checkValid();
+		/// Checks if the given date and time is valid (all arguments are within a proper range).
+		/// Expects all members to be set.
+		///
+		/// Throws Poco::InvalidArgumentException if any of the arguments is not valid.
+
 	static double toJulianDay(Timestamp::UtcTimeVal utcTime);
 		/// Computes the Julian day for an UTC time.
 

Foundation/include/Poco/DeflatingStream.h

@@ -22,11 +22,8 @@
 #include "Poco/BufferedStreamBuf.h"
 #include <istream>
 #include <ostream>
-#if defined(POCO_UNBUNDLED)
-#include <zlib.h>
-#else
-#include "Poco/zlib.h"
-#endif
+
+struct z_stream_s;
 
 
 namespace Poco {
@@ -47,6 +44,17 @@ class Foundation_API DeflatingStreamBuf: public BufferedStreamBuf
 		STREAM_GZIP  /// Create a gzip header, use CRC-32 checksum.
 	};
 
+	enum CompressionLevel
+		/// Constants for compression levels.
+		/// Note to maintainers: These must be kept in sync with the constants
+		/// defined by zlib.
+	{
+		DEFAULT_COMPRESSION = -1,
+		NO_COMPRESSION      =  0,
+		BEST_SPEED          =  1,
+		BEST_COMPRESSION    =  9
+	};
+
 	DeflatingStreamBuf(std::istream& istr, StreamType type, int level);
 		/// Creates a DeflatingStreamBuf for compressing data read
 		/// from the given input stream.
@@ -89,11 +97,11 @@ class Foundation_API DeflatingStreamBuf: public BufferedStreamBuf
 		DEFLATE_BUFFER_SIZE = 32768
 	};
 
-	std::istream* _pIstr;
-	std::ostream* _pOstr;
-	char*    _buffer;
-	z_stream _zstr;
-	bool     _eof;
+	std::istream*	_pIstr;
+	std::ostream*	_pOstr;
+	char*			_buffer;
+	z_stream_s*		_pZstr;
+	bool			_eof;
 };
 
 
@@ -104,7 +112,7 @@ class Foundation_API DeflatingIOS: public virtual std::ios
 	/// order of the stream buffer and base classes.
 {
 public:
-	DeflatingIOS(std::ostream& ostr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = Z_DEFAULT_COMPRESSION);
+	DeflatingIOS(std::ostream& ostr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = DeflatingStreamBuf::DEFAULT_COMPRESSION);
 		/// Creates a DeflatingIOS for compressing data passed
 		/// through and forwarding it to the given output stream.
 
@@ -115,7 +123,7 @@ class Foundation_API DeflatingIOS: public virtual std::ios
 		/// Please refer to the zlib documentation of deflateInit2() for a description
 		/// of the windowBits parameter.
 
-	DeflatingIOS(std::istream& istr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = Z_DEFAULT_COMPRESSION);
+	DeflatingIOS(std::istream& istr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = DeflatingStreamBuf::DEFAULT_COMPRESSION);
 		/// Creates a DeflatingIOS for compressing data read
 		/// from the given input stream.
 
@@ -150,7 +158,7 @@ class Foundation_API DeflatingOutputStream: public std::ostream, public Deflatin
 	///     ostr.close();
 {
 public:
-	DeflatingOutputStream(std::ostream& ostr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = Z_DEFAULT_COMPRESSION);
+	DeflatingOutputStream(std::ostream& ostr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = DeflatingStreamBuf::DEFAULT_COMPRESSION);
 		/// Creates a DeflatingOutputStream for compressing data passed
 		/// through and forwarding it to the given output stream.
 
@@ -179,7 +187,7 @@ class Foundation_API DeflatingInputStream: public std::istream, public Deflating
 	/// using zlib's deflate algorithm.
 {
 public:
-	DeflatingInputStream(std::istream& istr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = Z_DEFAULT_COMPRESSION);
+	DeflatingInputStream(std::istream& istr, DeflatingStreamBuf::StreamType type = DeflatingStreamBuf::STREAM_ZLIB, int level = DeflatingStreamBuf::DEFAULT_COMPRESSION);
 		/// Creates a DeflatingIOS for compressing data read
 		/// from the given input stream.
 

Foundation/include/Poco/Dynamic/VarIterator.h

@@ -69,6 +69,18 @@ class Foundation_API VarIterator
 	bool operator != (const VarIterator& other) const;
 		/// Inequality operator.
 
+	bool operator < (const VarIterator& other) const;
+		/// Less than operator.
+
+	bool operator > (const VarIterator& other) const;
+		/// Greater than operator.
+
+	bool operator <= (const VarIterator& other) const;
+		/// Less than or equal to operator.
+
+	bool operator >= (const VarIterator& other) const;
+		/// Greater than or equal to operator.
+
 	Var& operator * () const;
 		/// Returns value at the current position.
 
@@ -138,6 +150,30 @@ inline bool VarIterator::operator != (const VarIterator& other) const
 }
 
 
+inline bool VarIterator::operator < (const VarIterator& other) const
+{
+	return _position < other._position;
+}
+
+
+inline bool VarIterator::operator > (const VarIterator& other) const
+{
+	return _position > other._position;
+}
+
+
+inline bool VarIterator::operator <= (const VarIterator& other) const
+{
+	return _position <= other._position;
+}
+
+
+inline bool VarIterator::operator >= (const VarIterator& other) const
+{
+	return _position >= other._position;
+}
+
+
 } } // namespace Poco::Dynamic
 
 

Foundation/include/Poco/Exception.h

@@ -100,9 +100,15 @@ class Foundation_API Exception: public std::exception
 private:
 	std::string _msg;
 	Exception*  _pNested;
-	int			_code;
+	int			_code;    
 };
 
+#if defined(_HAS_EXCEPTIONS)
+    // Size of Poco::Exception depends on the exception settings (like _HAS_EXCEPTIONS)
+    // that might influence size of std::exception from which Poco::Exception is derived from.
+    // It is expected that Poco libraries and application using Poco have the same settings.
+    static_assert(_HAS_EXCEPTIONS != 0);
+#endif
 
 //
 // inlines

Foundation/include/Poco/InflatingStream.h

@@ -22,11 +22,8 @@
 #include "Poco/BufferedStreamBuf.h"
 #include <istream>
 #include <ostream>
-#if defined(POCO_UNBUNDLED)
-#include <zlib.h>
-#else
-#include "Poco/zlib.h"
-#endif
+
+struct z_stream_s;
 
 
 namespace Poco {
@@ -92,12 +89,12 @@ class Foundation_API InflatingStreamBuf: public BufferedStreamBuf
 		INFLATE_BUFFER_SIZE = 32768
 	};
 
-	std::istream*  _pIstr;
-	std::ostream*  _pOstr;
-	char*    _buffer;
-	z_stream _zstr;
-	bool     _eof;
-	bool     _check;
+	std::istream*	_pIstr;
+	std::ostream*	_pOstr;
+	char*			_buffer;
+	z_stream_s*		_pZstr;
+	bool			_eof;
+	bool			_check;
 };
 
 

Foundation/include/Poco/UUIDGenerator.h

@@ -99,7 +99,6 @@ class Foundation_API UUIDGenerator
 
 protected:
 	Timestamp::UtcTimeVal timeStamp();
-	void getNode();
 
 private:
 	FastMutex           _mutex;

Foundation/src/Checksum.cpp

@@ -16,7 +16,7 @@
 #if defined(POCO_UNBUNDLED)
 #include <zlib.h>
 #else
-#include "Poco/zlib.h"
+#include "zlib.h"
 #endif