From d46bdbf959889e7a8ba3eaff86000b5435b87115 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 3 Jan 2024 00:42:01 +0800 Subject: [PATCH] Fix misinterpretation of '+' in URI paths, fixes #408 --- cabal.project | 5 +++++ lib/GHCup/Download.hs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index fa6ad49..538ac0e 100644 --- a/cabal.project +++ b/cabal.project @@ -13,6 +13,11 @@ source-repository-package location: https://github.com/fosskers/versions.git tag: 7bc3355348aac3510771d4622aff09ac38c9924d +source-repository-package + type: git + location: https://github.com/hasufell/uri-bytestring.git + tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + package libarchive flags: -system-libarchive diff --git a/lib/GHCup/Download.hs b/lib/GHCup/Download.hs index 2de9519..0dec9a1 100644 --- a/lib/GHCup/Download.hs +++ b/lib/GHCup/Download.hs @@ -855,7 +855,7 @@ getGpgOpts = -- "baz" urlBaseName :: ByteString -- ^ the url path (without scheme and host) -> ByteString -urlBaseName = snd . B.breakEnd (== _slash) . urlDecode False +urlBaseName = snd . B.breakEnd (== _slash) -- | Curl saves all intermediate connect headers as well, not just the last one, so we make an effort to take the