# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1504078171 -7200
# Node ID a60a79929007b7de6648d77ad76d3b6c75847867
# Parent  01e1a25da9afa7dc1c297241ec033a80c14fc504# Parent  883387e2b37964e2bcfe469f1b343795823e42b9
merge

diff -r 01e1a25da9af -r a60a79929007 UnitTestsSources/LuaTests.cpp
--- a/UnitTestsSources/LuaTests.cpp	Wed Aug 30 09:26:48 2017 +0200
+++ b/UnitTestsSources/LuaTests.cpp	Wed Aug 30 09:29:31 2017 +0200
@@ -288,11 +288,10 @@
   Orthanc::LuaContext lua;
 
 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1
-  // It is not guaranteed that the URL on server
-  // "www.montefiore.ulg.ac.be" will work forever. We switched to it,
-  // as the "www.orthanc-server.com" now mandatory uses HTTPS.
-  const std::string BASE = "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/";
-  //const std::string BASE = "http://www.orthanc-server.com/downloads/third-party/";
+  // The "http://www.orthanc-server.com/downloads/third-party/" does
+  // not automatically redirect to HTTPS, so we cas use it even if the
+  // OpenSSL/HTTPS support is disabled in curl
+  const std::string BASE = "http://www.orthanc-server.com/downloads/third-party/";
 
   lua.Execute("JSON = loadstring(HttpGet('" + BASE + "JSON.lua')) ()");
   const std::string url(BASE + "Product.json");
diff -r 01e1a25da9af -r a60a79929007 UnitTestsSources/RestApiTests.cpp
--- a/UnitTestsSources/RestApiTests.cpp	Wed Aug 30 09:26:48 2017 +0200
+++ b/UnitTestsSources/RestApiTests.cpp	Wed Aug 30 09:29:31 2017 +0200
@@ -66,11 +66,10 @@
   ASSERT_FALSE(c.IsVerbose());
 
 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1
-  // It is not guaranteed that the URL on server
-  // "www.montefiore.ulg.ac.be" will work forever. We switched to it,
-  // as the "www.orthanc-server.com" now mandatory uses HTTPS.
-  const std::string BASE = "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/";
-  //const std::string BASE = "http://www.orthanc-server.com/downloads/third-party/";
+  // The "http://www.orthanc-server.com/downloads/third-party/" does
+  // not automatically redirect to HTTPS, so we cas use it even if the
+  // OpenSSL/HTTPS support is disabled in curl
+  const std::string BASE = "http://www.orthanc-server.com/downloads/third-party/";
 
   Json::Value v;
   c.SetUrl(BASE + "Product.json");