Mercurial > hg > orthanc
changeset 2387:a60a79929007
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 30 Aug 2017 09:29:31 +0200 |
| parents | 01e1a25da9af (current diff) 883387e2b379 (diff) |
| children | 50cde8246542 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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");
--- 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");