work

lib/Humming-Bird/Core.rakumod

@@ -4,6 +4,7 @@ use strict;
 use HTTP::Status;
 use DateTime::Format::RFC2822;
 use MIME::Types;
+use URI::Encode;
 
 use Humming-Bird::HTTPServer;
 
@@ -98,8 +99,12 @@ class HTTPAction {
 }
 
 my sub parse-urlencoded(Str:D $urlencoded --> Map:D) {
+<<<<<<< Updated upstream
     use URI::Encode;
     uri_decode_component($urlencoded).split('&', :skip-empty)>>.split('=', :skip-empty)>>.map(-> $a, $b { $b.contains(',') ?? slip $a => $b.split(',', :skip-empty) !! slip $a => $b }).flat.Map;
+=======
+    $urlencoded.split('&', :skip-empty)>>.split('=', 2, :skip-empty)>>.map(-> $a, $b { $b.contains(',') ?? slip $a => $b.split(',', :skip-empty) !! slip $a => $b }).flat.Map;
+>>>>>>> Stashed changes
 }
 
 class Request is HTTPAction is export {

t/11-advanced-query.rakutest

@@ -25,4 +25,10 @@ is $advanced_request.query('foo'), 'bar@baz', 'Is first of query params correct?
 is $advanced_request.query('j'), '123@abc', 'Is second of query params correct?';
 is $advanced_request.queries, { j => '123@abc', foo => 'bar@baz' }, 'Is queries hash correct?';
 
+my $weird_raw_request = "GET /?foo=foo%3Fbar%3D123%3D23 HTTP/1.1\r\nHost: bob.com\r\n";
+my $weird_request = Request.decode: $weird_raw_request;
+
+ok $weird_request.method === GET, 'Is method OK?';
+is $weird_request.query('foo'), 'foo?bar=123=23', 'Is query decoded correctly?';
+
 done-testing;