Commit 236f4a84 authored by Lorenzo "Palinuro" Faletra's avatar Lorenzo "Palinuro" Faletra Committed by Lorenzo "Palinuro" Faletra
Browse files

Import Debian version 1.8.4+parrot1

apt (1.8.4+parrot1) rolling; urgency=medium

  * Import new Debian version.
  * Re-allow https-to-http downgrades.
parent 321839f0
apt (1.8.4+parrot1) rolling; urgency=medium
* Import new Debian version.
* Re-allow https-to-http downgrades.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Wed, 25 Sep 2019 09:02:18 +0200
apt (1.8.4) unstable; urgency=medium
* CMake: Pass -Werror=return-type to gcc
......@@ -9,6 +16,19 @@ apt (1.8.4) unstable; urgency=medium
-- Julian Andres Klode <jak@debian.org> Thu, 19 Sep 2019 22:06:45 +0200
apt (1.8.3+parrot2) rolling; urgency=medium
* Rebuild package for rolling branch.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Sun, 18 Aug 2019 17:58:22 +0200
apt (1.8.3+parrot1) rolling; urgency=medium
* Import new Debian release.
* Re-allow https-to-http downgrades.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Thu, 15 Aug 2019 23:29:08 +0200
apt (1.8.3) unstable; urgency=medium
[ Simon Körner ]
......@@ -19,6 +39,19 @@ apt (1.8.3) unstable; urgency=medium
-- Julian Andres Klode <jak@debian.org> Fri, 09 Aug 2019 11:16:15 +0200
apt (1.8.2+parrot2) testing; urgency=medium
* Update CI Configuration.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Wed, 05 Jun 2019 16:27:38 +0200
apt (1.8.2+parrot1) testing; urgency=medium
* Import new Debian release.
* Re-apply https downgrade patch.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Wed, 05 Jun 2019 15:47:44 +0200
apt (1.8.2) unstable; urgency=medium
[ Alwin Henseler ]
......@@ -41,6 +74,13 @@ apt (1.8.2) unstable; urgency=medium
-- Julian Andres Klode <jak@debian.org> Tue, 28 May 2019 16:40:29 +0200
apt (1.8.1+parrot1) testing; urgency=medium
* Import new Debian release.
* Re-apply https downgrade patch.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Fri, 10 May 2019 21:47:56 +0200
apt (1.8.1) unstable; urgency=medium
* Add test case for local-only packages pinned to never
......
......@@ -373,6 +373,9 @@ BaseHttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)
// as well as http to https
else if ((Uri.Access == "http" || Uri.Access == "https+http") && tmpURI.Access == "https")
return TRY_AGAIN_OR_REDIRECT;
// allow https to http redirects (for https mirrordirectors with http mirrors)
else if ((Uri.Access == "https" || Uri.Access == "https+http") && tmpURI.Access == "http")
return TRY_AGAIN_OR_REDIRECT;
else
{
auto const tmpplus = tmpURI.Access.find('+');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment