Merge remote-tracking branch 'origin/master' into repobrowse

* origin/master:
  www: do not unescape PATH_INFO twice
  t/mime: quiet warnings for old versions of Email::Simple
  handle repeated References and In-Reply-To headers

2 files changed, 2 insertions, 1 deletions

diff --git a/t/cgi.t b/t/cgi.t
index 092ad8c7..77409660 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -148,7 +148,7 @@ EOF
         $im->add($reply);
         $im->done;
 
-        my $res = cgi_run("/test/slashy%2fasdf\@example.com/raw");
+        my $res = cgi_run("/test/slashy/asdf\@example.com/raw");
         like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,
                 "slashy mid raw hit");
 
diff --git a/t/mime.t b/t/mime.t
index c4bdcf0d..b0e2290e 100644
--- a/t/mime.t
+++ b/t/mime.t
@@ -8,6 +8,7 @@ use Test::More;
 use_ok 'PublicInbox::MIME';
 use PublicInbox::MsgIter;
 
+local $SIG{__WARN__} = sub {};
 my $msg = PublicInbox::MIME->new(
 'From:   Richard Hansen <hansenr@google.com>
 To:     git@vger.kernel.org