Ignore the (unrouteable) FTP passive-mode IP address given byv2.13.157

the Dolby certificate server (#1541).

5 files changed, 6 insertions, 6 deletions

diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc
index ba7deb8fd..84048c65c 100644
--- a/src/wx/barco_alchemy_certificate_panel.cc
+++ b/src/wx/barco_alchemy_certificate_panel.cc
@@ -60,7 +60,7 @@ BarcoAlchemyCertificatePanel::do_download ()
 		serial
 		);
 
-	optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+	optional<string> error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
 	if (error) {
 		_dialog->message()->SetLabel(wxT(""));
 		error_dialog (this, std_to_wx(*error));
diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index fa91cc2b5..9e95aa994 100644
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -57,13 +57,13 @@ ChristieCertificatePanel::do_download ()
 
 	optional<string> all_errors;
 
-	optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+	optional<string> error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
 	if (error) {
 		all_errors = *error;
 
 		string const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
 
-		error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+		error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
 		if (error) {
 			*all_errors += "\n" + *error;
 		}
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index ea0207a9b..c37b42e43 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -177,7 +177,7 @@ DolbyDoremiCertificatePanel::do_download ()
 	list<string>::const_iterator i = urls.begin ();
 	list<string>::const_iterator j = files.begin ();
 	while (!ok && i != urls.end ()) {
-		optional<string> error = get_from_zip_url (*i++, *j++, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+		optional<string> error = get_from_zip_url (*i++, *j++, true, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
 		if (error) {
 			errors.push_back (error.get ());
 		} else {
diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index a90f098f5..b0bb31674 100644
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -51,7 +51,7 @@ GDCCertificatePanel::do_download ()
 		wx_to_std(_serial->GetValue())
 		);
 
-	optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+	optional<string> error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
 
 	if (error) {
 		_dialog->message()->SetLabel(wxT(""));
diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 78419a08c..33db37bab 100644
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -348,7 +348,7 @@ SwaroopControls::get_kdm_from_url (shared_ptr<DCPContent> dcp)
 	string url = Config::instance()->kdm_server_url();
 	boost::algorithm::replace_all (url, "{CPL}", *dcp->cpl());
 	optional<dcp::EncryptedKDM> kdm;
-	if (dcp->cpl() && !get_from_url(url, false, temp)) {
+	if (dcp->cpl() && !get_from_url(url, false, false, temp)) {
 		try {
 			kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file()));
 			if (kdm->cpl_id() != dcp->cpl()) {