Skip to content

Commit

Permalink
fetch cacert so curl works for ssl, only output curl noise in debug mode
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Sep 26, 2018
1 parent 1163f7b commit a7e0b22
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions appveyor.yml
Expand Up @@ -41,7 +41,9 @@ install:
- call %OSGEO4W_ROOT%\bin\py3_env.bat
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- set PATH=%PATH%;C:\Program Files (x86)\CMake\bin
- ps: (new-object net.webclient).DownloadFile("http://curl.haxx.se/ca/cacert.pem", "c:\osgeo4w64\bin\curl-ca-bundle.crt")
- call scripts\\appveyor\\config.cmd


build_script:
- call scripts\\appveyor\\build.cmd
Expand Down
5 changes: 4 additions & 1 deletion plugins/i3s/io/EsriReader.cpp
Expand Up @@ -64,9 +64,12 @@ void EsriReader::addArgs(ProgramArgs& args)

void EsriReader::initialize(PointTableRef table)
{

Json::Value config;
if (log()->getLevel() > LogLevel::Debug4)

if (isDebug() && log()->getLevel() > LogLevel::Debug4)
config["arbiter"]["verbose"] = true;

m_arbiter.reset(new arbiter::Arbiter(config));

const std::string pre("i3s://");
Expand Down
2 changes: 1 addition & 1 deletion scripts/appveyor/test.cmd
@@ -1,5 +1,5 @@
pushd build

set CURL_CA_INFO=C:\OSGeo4W64\bin\curl-ca-bundle.crt
ctest -V --output-on-failure

popd

0 comments on commit a7e0b22

Please sign in to comment.