add ca bundle loading back to CURL

This commit is contained in:
Konstantin Käfer
2015-02-06 16:13:25 +01:00
committed by Konstantin Käfer
parent fe0baffe0d
commit b29bce0936
8 changed files with 150 additions and 24 deletions

View File

@@ -43,7 +43,7 @@ void Source::load(Map& map, FileSource& fileSource) {
const std::string url = util::mapbox::normalizeSourceURL(info.url, map.getAccessToken());
fileSource.request({ Resource::Kind::JSON, url }, **map.loop, [source, &map](const Response &res) {
if (res.status != Response::Successful) {
Log::Warning(Event::General, "failed to load source TileJSON");
Log::Warning(Event::General, "Failed to load source TileJSON: %s", res.message.c_str());
return;
}
@@ -51,7 +51,7 @@ void Source::load(Map& map, FileSource& fileSource) {
d.Parse<0>(res.data.c_str());
if (d.HasParseError()) {
Log::Warning(Event::General, "invalid source TileJSON");
Log::Warning(Event::General, "Invalid source TileJSON; Parse Error at %d: %s", d.GetErrorOffset(), d.GetParseError());
return;
}