From 90c13efab1fd1b67625ec23815ccc195803e230e Mon Sep 17 00:00:00 2001 From: dec05eba Date: Mon, 28 Sep 2020 00:21:23 +0200 Subject: Matrix: fix login with pantalaimon proxy, fix logout crash, show real login error --- src/DownloadUtils.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/DownloadUtils.cpp') diff --git a/src/DownloadUtils.cpp b/src/DownloadUtils.cpp index b7636d8..e748198 100644 --- a/src/DownloadUtils.cpp +++ b/src/DownloadUtils.cpp @@ -16,12 +16,14 @@ static const char *useragent_str = "user-agent: Mozilla/5.0 (X11; Linux x86_64) namespace QuickMedia { // TODO: Add timeout - DownloadResult download_to_string(const std::string &url, std::string &result, const std::vector &additional_args, bool use_tor, bool use_browser_useragent) { + DownloadResult download_to_string(const std::string &url, std::string &result, const std::vector &additional_args, bool use_tor, bool use_browser_useragent, bool fail_on_error) { sf::Clock timer; std::vector args; if(use_tor) args.push_back("torsocks"); - args.insert(args.end(), { "curl", "-f", "-H", "Accept-Language: en-US,en;q=0.5", "-H", "Connection: keep-alive", "--compressed", "-s", "-L" }); + args.insert(args.end(), { "curl", "-H", "Accept-Language: en-US,en;q=0.5", "-H", "Connection: keep-alive", "--compressed", "-s", "-L" }); + if(fail_on_error) + args.push_back("-f"); for(const CommandArg &arg : additional_args) { args.push_back(arg.option.c_str()); args.push_back(arg.value.c_str()); -- cgit v1.2.3