From a81083d080152eb06200c250a4879ece451165d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 5 Sep 2024 15:16:51 +0200
Subject: [PATCH 1/2] Revert "Update src/libutil/url.cc"

This reverts commit 9b1cefe27e542d890aa346996a03dfecd9793dfe.
---
 src/libutil/url.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/url.cc b/src/libutil/url.cc
index 8ef1857bb..78c832440 100644
--- a/src/libutil/url.cc
+++ b/src/libutil/url.cc
@@ -81,7 +81,7 @@ std::map<std::string, std::string> decodeQuery(const std::string & query)
         auto e = s.find('=');
 
         if (e == std::string::npos) {
-            warn("dubious URI query '%s' is missing equal sign '%s'", s, "=");
+            warn("invalid URI query '%s', did you forget an equals sign `=`?", s);
             continue;
         }
 

From 5a5a010120928262341a11b88b58373a55f013b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 5 Sep 2024 15:16:53 +0200
Subject: [PATCH 2/2] Revert "fix: Error on malformed URI query parameter"

This reverts commit c9f45677b585dabb3a83570e21426257d92746bd.

This now triggers on simple cases like `nix build .#nix`.
Reverting for now.
---
 src/libutil/url.cc | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/libutil/url.cc b/src/libutil/url.cc
index 78c832440..bcbe9ea4e 100644
--- a/src/libutil/url.cc
+++ b/src/libutil/url.cc
@@ -79,15 +79,10 @@ std::map<std::string, std::string> decodeQuery(const std::string & query)
 
     for (auto s : tokenizeString<Strings>(query, "&")) {
         auto e = s.find('=');
-
-        if (e == std::string::npos) {
-            warn("invalid URI query '%s', did you forget an equals sign `=`?", s);
-            continue;
-        }
-
-        result.emplace(
-            s.substr(0, e),
-            percentDecode(std::string_view(s).substr(e + 1)));
+        if (e != std::string::npos)
+            result.emplace(
+                s.substr(0, e),
+                percentDecode(std::string_view(s).substr(e + 1)));
     }
 
     return result;