From 1bcba2c1b09f440e4017d5aeb411e5efaf08b809 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 5 Dec 2022 12:31:45 +0200
Subject: Forward --curl* options to bpkg

---
 bdep/common.cli  |  8 ++++++--
 bdep/utility.txx | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bdep/common.cli b/bdep/common.cli
index 1e95084..ed7a901 100644
--- a/bdep/common.cli
+++ b/bdep/common.cli
@@ -174,7 +174,8 @@ namespace bdep
        with \cb{--curl-option}.
 
        If the curl program is not explicitly specified, then \cb{bdep} will use
-       \cb{curl} by default."
+       \cb{curl} by default. Note that this program will also be used by the
+       underlying \cb{bpkg} invocations unless overridden."
     }
 
     strings --curl-option
@@ -182,7 +183,10 @@ namespace bdep
       "<opt>",
       "Additional option to be passed to the curl program. See \cb{--curl} for
        more information on the curl program. Repeat this option to specify
-       multiple curl options."
+       multiple curl options.
+
+       Note that these options will also be used by the underlying \cb{bpkg}
+       invocations provided that curl is used."
     }
 
     string --pager // String to allow empty value.
diff --git a/bdep/utility.txx b/bdep/utility.txx
index 12bc06c..100ee07 100644
--- a/bdep/utility.txx
+++ b/bdep/utility.txx
@@ -135,6 +135,20 @@ namespace bdep
         ops.push_back (o.c_str ());
       }
 
+      // Forward our --curl* options.
+      //
+      if (co.curl_specified ())
+      {
+        ops.push_back ("--curl");
+        ops.push_back (co.curl ().string ().c_str ());
+      }
+
+      for (const string& o: co.curl_option ())
+      {
+        ops.push_back ("--curl-option");
+        ops.push_back (o.c_str ());
+      }
+
       return process_start_callback (
         [v] (const char* const args[], size_t n)
         {
-- 
cgit v1.1