methods/https.cc: Add support for authentication using netrc (Closes: #518473),

patch  by Jussi Hakala <jussi.hakala@hut.fi>.

diff --git a/debian/changelog b/debian/changelog
index 34a35b2f9dd6066bc737b98dc45e406a0eef5f47..68ee83bac8c23642f9142ebe0c796d004c82dce3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ apt (0.7.25) UNRELEASED; urgency=low
     - Restrict option names to alphanumerical characters and "/-:._+".
     - Deprecate #include, we have apt.conf.d nowadays which should be
       sufficient.
+  * methods/https.cc:
+    - Add support for authentication using netrc (Closes: #518473), patch
+      by Jussi Hakala <jussi.hakala@hut.fi>.
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200
 

diff --git a/methods/https.cc b/methods/https.cc
index 37d93e308dcf11452b0685432317d2d2699c5287..79e6fea3f42d6c1b173993a6092ba5d1a71329da 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -135,6 +135,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
    curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
    curl_easy_setopt(curl, CURLOPT_FILETIME, true);
+   curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
 
    // SSL parameters are set by default to the common (non mirror-specific) value
    // if available (or a default one) and gets overload by mirror-specific ones.