Use proxy settings during self upgrade.

SoftwareNetwork · Feb 14, 2020 · b286393 · b286393
1 parent dca1464
commit b286393
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/sw/client/cli/client.cpp b/src/sw/client/cli/client.cpp
@@ -324,6 +324,9 @@ int parse_main(int argc, char **argv)
 
     // create main options!
     Options options;
+    // set http settings very early
+    // needed for self-upgrade feature
+    setHttpSettings(options);
     return setup_main(args, options);
 }
 

diff --git a/src/sw/client/common/common.cpp b/src/sw/client/common/common.cpp
@@ -26,12 +26,17 @@
 
 #include <cl.llvm.h>
 
-std::unique_ptr<sw::SwContext> createSwContext(const Options &options)
+void setHttpSettings(const Options &options)
 {
-    // load proxy settings early
     httpSettings.verbose = options.curl_verbose;
     httpSettings.ignore_ssl_checks = options.ignore_ssl_checks;
     httpSettings.proxy = sw::Settings::get_local_settings().proxy;
+}
+
+std::unique_ptr<sw::SwContext> createSwContext(const Options &options)
+{
+    // load proxy settings before ctx
+    setHttpSettings(options);
 
     auto swctx = std::make_unique<sw::SwContext>(options.storage_dir.empty() ? sw::Settings::get_user_settings().storage_dir : options.storage_dir);
     // TODO:

diff --git a/src/sw/client/common/common.h b/src/sw/client/common/common.h
@@ -24,6 +24,7 @@
 struct Options;
 
 std::unique_ptr<sw::SwContext> createSwContext(const Options &);
+void setHttpSettings(const Options &);
 
 struct Program
 {