Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Full Changelog: https://github.com/pocoproject/poco/blob/poco-1.12.4/CHANGELOG PR: 272371
- Loading branch information
Showing
5 changed files
with
449 additions
and
288 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1616964872 | ||
| SHA256 (poco-1.10.1-all.tar.bz2) = 2cde4b50778013ab3b7a522aa59bccaa7e85a8ccfc654a354c4d9611b6ce1758 | ||
| SIZE (poco-1.10.1-all.tar.bz2) = 5313561 | ||
| TIMESTAMP = 1688499287 | ||
| SHA256 (poco-1.12.4-all.tar.bz2) = 4e6ccc0df904596478414ef56a992cf885eb4b0ee695b23d307eb2ff91c36626 | ||
| SIZE (poco-1.12.4-all.tar.bz2) = 5990710 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- Crypto/src/OpenSSLInitializer.cpp.orig 2023-07-04 22:23:04 UTC | ||
| +++ Crypto/src/OpenSSLInitializer.cpp | ||
| @@ -137,7 +137,6 @@ void OpenSSLInitializer::initialize() | ||
| if (!_legacyProvider) | ||
| { | ||
| _legacyProvider = OSSL_PROVIDER_load(NULL, "legacy"); | ||
| - if (!_legacyProvider) throw CryptoException("Failed to load OpenSSL legacy provider"); | ||
| } | ||
| #endif | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| --- Foundation/src/Thread_POSIX.cpp.orig 2022-10-31 17:44:32 UTC | ||
| +++ Foundation/src/Thread_POSIX.cpp | ||
| @@ -19,6 +19,13 @@ | ||
| #include "Poco/Timespan.h" | ||
| #include "Poco/Timestamp.h" | ||
| #include <signal.h> | ||
| + | ||
| +#if POCO_OS == POCO_OS_FREE_BSD | ||
| +# include <sys/thr.h> | ||
| +# include <pthread_np.h> | ||
| +# include <osreldate.h> | ||
| +#endif | ||
| + | ||
| #if defined(__sun) && defined(__SVR4) | ||
| # if !defined(__EXTENSIONS__) | ||
| # define __EXTENSIONS__ | ||
| @@ -65,7 +72,10 @@ void setThreadName(pthread_t thread, const std::string | ||
| namespace { | ||
| void setThreadName(pthread_t thread, const std::string& threadName) | ||
| { | ||
| -#if (POCO_OS == POCO_OS_MAC_OS_X) | ||
| +#if POCO_OS == POCO_OS_FREE_BSD && __FreeBSD_version < 1300000 | ||
| + pthread_set_name_np(pthread_self(), threadName.c_str()); | ||
| + return; | ||
| +#elif (POCO_OS == POCO_OS_MAC_OS_X) | ||
| pthread_setname_np(threadName.c_str()); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2) | ||
| #else | ||
| if (pthread_setname_np(thread, threadName.c_str()) == ERANGE && threadName.size() > 15) | ||
| @@ -273,11 +283,17 @@ long ThreadImpl::currentOsTidImpl() | ||
| long ThreadImpl::currentOsTidImpl() | ||
| { | ||
| #if POCO_OS == POCO_OS_LINUX | ||
| - return ::syscall(SYS_gettid); | ||
| + return ::syscall(SYS_gettid); | ||
| #elif POCO_OS == POCO_OS_MAC_OS_X | ||
| - return ::pthread_mach_thread_np(::pthread_self()); | ||
| + return ::pthread_mach_thread_np(::pthread_self()); | ||
| +#elif POCO_OS == POCO_OS_FREE_BSD | ||
| + long id; | ||
| + if(thr_self(&id) < 0) { | ||
| + return 0; | ||
| + } | ||
| + return id; | ||
| #else | ||
| - return ::pthread_self(); | ||
| + return ::pthread_self(); | ||
| #endif | ||
| } | ||
|
|
Oops, something went wrong.