From 1ea73ea22b4d2ea3a9c123753bdc58f9d480e188 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 16 May 2019 07:06:21 +0000 Subject: www: unescape '+' => ' ' before general URI unescape This allows searching for terms with "+" in them properly. --- lib/PublicInbox/WWW.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index 1f3ca157..1c349d76 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -59,14 +59,14 @@ sub call { my $ctx = { env => $env, www => $self }; # we don't care about multi-value - my %qp = map { + %{$ctx->{qp}} = map { utf8::decode($_); - my ($k, $v) = split('=', uri_unescape($_), 2); - $v = '' unless defined $v; - $v =~ tr/+/ /; - ($k, $v) + tr/+/ /; + my ($k, $v) = split('=', $_, 2); + $v = uri_unescape($v // ''); + # none of the keys we care about will need escaping + $k => $v; } split(/[&;]+/, $env->{QUERY_STRING}); - $ctx->{qp} = \%qp; # avoiding $env->{PATH_INFO} here since that's already decoded my ($path_info) = ($env->{REQUEST_URI} =~ path_re($env)); -- cgit v1.2.3-24-ge0c7