# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1607963531 -3600
# Node ID e01322c6109444a9fd48b66c8cd3a0163f01ab5f
# Parent  5e604adfd41fa8e2de750782e4d643d77d6773ce# Parent  3f4fa9ca637b4c12511cbe762c35a3921c5c1b70
integration PostgreSQL-3.3 -> mainline

diff -r 5e604adfd41f -r e01322c61094 MySQL/CMakeLists.txt
--- a/MySQL/CMakeLists.txt	Mon Dec 14 16:21:05 2020 +0100
+++ b/MySQL/CMakeLists.txt	Mon Dec 14 17:32:11 2020 +0100
@@ -11,7 +11,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.8.1")
+  set(ORTHANC_FRAMEWORK_VERSION "4a3ba4bf4ba7")  # This is Orthanc Framework pre-1.8.2 (includes a fix for OpenSSL on MSVC)
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 5e604adfd41f -r e01322c61094 PostgreSQL/CMakeLists.txt
--- a/PostgreSQL/CMakeLists.txt	Mon Dec 14 16:21:05 2020 +0100
+++ b/PostgreSQL/CMakeLists.txt	Mon Dec 14 17:32:11 2020 +0100
@@ -11,7 +11,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.8.1")
+  set(ORTHANC_FRAMEWORK_VERSION "4a3ba4bf4ba7")  # This is Orthanc Framework pre-1.8.2 (includes a fix for OpenSSL on MSVC)
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 5e604adfd41f -r e01322c61094 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Dec 14 16:21:05 2020 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Mon Dec 14 17:32:11 2020 +0100
@@ -134,6 +134,9 @@
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
         # Stone Web viewer 1.0 (framework pre-1.8.1)
         set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
+        # PostgreSQL 3.3 (framework pre-1.8.2)
+        set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
       endif()
     endif()
   endif()