This is the mail archive of the
cygwin-apps-cvs
mailing list for the cygwin-apps project.
[setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.880-1-g66d0ef9
- From: jturney at sourceware dot org
- To: cygwin-apps-cvs at sourceware dot org
- Date: 20 Jun 2017 11:54:01 -0000
- Subject: [setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.880-1-g66d0ef9
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=66d0ef9865c8ca1e0c7d691fe67d663eecb17cf1
commit 66d0ef9865c8ca1e0c7d691fe67d663eecb17cf1
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Jun 19 11:46:27 2017 +0100
Accept sites using https:// and ftps:// protocols in mirrors.lst
Also report when a line from mirrors.lst is being discarded due to a URL
using an unknown protocol.
Diff:
---
site.cc | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/site.cc b/site.cc
index b05657b..c33da36 100644
--- a/site.cc
+++ b/site.cc
@@ -264,7 +264,9 @@ load_site_list (SiteList& theSites, char *theString)
continue;
/* Accept only the URL schemes we can understand. */
if (strncmp(bol, "http://", 7) == 0 ||
- strncmp(bol, "ftp://", 6) == 0)
+ strncmp(bol, "https://", 8) == 0 ||
+ strncmp(bol, "ftp://", 6) == 0 ||
+ strncmp(bol, "ftps://", 7) == 0)
{
char *semi = strchr (bol, ';');
char *semi2 = NULL;
@@ -306,6 +308,10 @@ load_site_list (SiteList& theSites, char *theString)
//TODO: remove and remerge
*i = newsite;
}
+ else
+ {
+ Log (LOG_BABBLE) << "Discarding line '" << bol << "' due to unknown protocol" << endLog;
+ }
}
}