diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-14 20:14:52 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-14 20:45:24 +0200 |
| commit | dd0f6069a536f414c5b37c786bb36dfc7fdf3d20 (patch) | |
| tree | 86c23e1e09d8f76972f59d38daaa11483b6fa119 /src/lib/internet.h | |
| parent | a0bba66b8a34d594a62750bd595e5cdc561abdf4 (diff) | |
Don't say 'certificate downloaded' if it failed during the read part.
Backported from 8c7ad603cf0a534abe1a920b70b0daa095257d3a in v2.15.x
Diffstat (limited to 'src/lib/internet.h')
| -rw-r--r-- | src/lib/internet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/internet.h b/src/lib/internet.h index 125533b5d..da0bfc005 100644 --- a/src/lib/internet.h +++ b/src/lib/internet.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -25,5 +25,5 @@ class ScopedTemporary; boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp); -boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load); -boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load); +boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, boost::function<boost::optional<std::string> (boost::filesystem::path)> load); +boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, bool skip_pasv_ip, boost::function<boost::optional<std::string> (boost::filesystem::path)> load); |
