-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# FIXME: this test is too slow and most non-CGI-requirements
# should be moved over to things which use test_psgi
use strict;
$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");
$res = cgi_run("/test/blahblah\@example.com/raw");
like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/,
"mid raw hit");
- $res = cgi_run("/test/blahblah\@example.con/raw");
- like($res->{head}, qr/Status: 300 Multiple Choices/, "mid raw miss");
$res = cgi_run("/test/blahblah\@example.com/");
like($res->{body}, qr/\A<html>/, "mid html hit");
like($res->{head}, qr/Status: 200 OK/, "200 response");
- $res = cgi_run("/test/blahblah\@example.con/");
- like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
$res = cgi_run("/test/blahblah\@example.com/f/");
like($res->{head}, qr/Status: 301 Moved/, "301 response");
like($res->{head},
qr!^Location: http://[^/]+/test/blahblah\@example\.com/\r\n!ms,
'301 redirect location');
- $res = cgi_run("/test/blahblah\@example.con/");
- like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
$res = cgi_run("/test/new.html");
like($res->{body}, qr/slashy%2Fasdf\@example\.com/,
sub run_with_env {
my ($env, @args) = @_;
- my $init = sub { foreach my $k (keys %$env) { $ENV{$k} = $env->{$k} } };
- IPC::Run::run(@args, init => $init);
+ IPC::Run::run(@args, init => sub { %ENV = (%ENV, %$env) });
}
sub cgi_run {
my %env = (
PATH_INFO => $_[0],
QUERY_STRING => $_[1] || "",
+ SCRIPT_NAME => '',
+ REQUEST_URI => $_[0] . ($_[1] ? "?$_[1]" : ''),
REQUEST_METHOD => $_[2] || "GET",
GATEWAY_INTERFACE => 'CGI/1.1',
HTTP_ACCEPT => '*/*',