Mercurial > hg > orthanc-databases
changeset 267:ece4663dedde
Fix issue #193
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 21 Apr 2021 11:03:44 +0200 |
| parents | cc7af42d4f23 |
| children | 9b003f265a8f |
| files | PostgreSQL/NEWS PostgreSQL/Plugins/IndexPlugin.cpp PostgreSQL/Plugins/StoragePlugin.cpp PostgreSQL/UnitTests/UnitTestsMain.cpp |
| diffstat | 4 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/PostgreSQL/NEWS Tue Apr 20 17:41:44 2021 +0200 +++ b/PostgreSQL/NEWS Wed Apr 21 11:03:44 2021 +0200 @@ -6,6 +6,8 @@ * Support of revisions for metadata and attachments * Support of multiple readers/writers, by handling retries from Orthanc SDK 1.9.2 * Support of range reads for the storage area, from Orthanc SDK 1.9.0 +* Fix issue #193 (LSB binaries crash with PostgreSQL + SSL) by changeset + in OrthancFramework: https://hg.orthanc-server.com/orthanc/rev/9a9118406484 Release 3.3 (2020-12-14)
--- a/PostgreSQL/Plugins/IndexPlugin.cpp Tue Apr 20 17:41:44 2021 +0200 +++ b/PostgreSQL/Plugins/IndexPlugin.cpp Wed Apr 21 11:03:44 2021 +0200 @@ -23,6 +23,7 @@ #include "../../Framework/Plugins/PluginInitialization.h" #include <Logging.h> +#include <Toolbox.h> extern "C" @@ -34,6 +35,8 @@ return -1; } + Orthanc::Toolbox::InitializeOpenSsl(); + OrthancPlugins::OrthancConfiguration configuration; if (!configuration.IsSection("PostgreSQL")) @@ -82,6 +85,7 @@ { LOG(WARNING) << "PostgreSQL index is finalizing"; OrthancDatabases::IndexBackend::Finalize(); + Orthanc::Toolbox::FinalizeOpenSsl(); }
--- a/PostgreSQL/Plugins/StoragePlugin.cpp Tue Apr 20 17:41:44 2021 +0200 +++ b/PostgreSQL/Plugins/StoragePlugin.cpp Wed Apr 21 11:03:44 2021 +0200 @@ -23,6 +23,7 @@ #include "../../Framework/Plugins/PluginInitialization.h" #include <Logging.h> +#include <Toolbox.h> extern "C" { @@ -33,6 +34,8 @@ return -1; } + Orthanc::Toolbox::InitializeOpenSsl(); + OrthancPlugins::OrthancConfiguration configuration; if (!configuration.IsSection("PostgreSQL")) @@ -78,6 +81,7 @@ { LOG(WARNING) << "PostgreSQL storage area is finalizing"; OrthancDatabases::StorageBackend::Finalize(); + Orthanc::Toolbox::FinalizeOpenSsl(); }
--- a/PostgreSQL/UnitTests/UnitTestsMain.cpp Tue Apr 20 17:41:44 2021 +0200 +++ b/PostgreSQL/UnitTests/UnitTestsMain.cpp Wed Apr 21 11:03:44 2021 +0200 @@ -22,6 +22,7 @@ #include "../Plugins/PostgreSQLIndex.h" #include <Logging.h> +#include <Toolbox.h> #include <gtest/gtest.h> OrthancDatabases::PostgreSQLParameters globalParameters_; @@ -126,6 +127,7 @@ globalParameters_.SetDatabase(argv[5]); ::testing::InitGoogleTest(&argc, argv); + Orthanc::Toolbox::InitializeOpenSsl(); Orthanc::Logging::Initialize(); Orthanc::Logging::EnableInfoLevel(true); Orthanc::Logging::EnableTraceLevel(true); @@ -133,6 +135,7 @@ int result = RUN_ALL_TESTS(); Orthanc::Logging::Finalize(); + Orthanc::Toolbox::FinalizeOpenSsl(); return result; }