# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# note: our HTTP server should be standalone and capable of running
# generic PSGI/Plack apps.
-use strict;
-use warnings;
-use Test::More;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use Time::HiRes qw(gettimeofday tv_interval);
-use PublicInbox::Spawn qw(which spawn popen_rd);
-use PublicInbox::TestCommon;
+use PublicInbox::Spawn qw(spawn popen_rd);
require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
use Digest::SHA qw(sha1_hex);
use IO::Handle ();
-use IO::Socket;
use IO::Socket::UNIX;
use Fcntl qw(:seek);
use Socket qw(IPPROTO_TCP TCP_NODELAY SOL_SOCKET);
}
} elsif ($^O eq 'freebsd' && system('kldstat -m accf_data >/dev/null') == 0) {
require PublicInbox::Daemon;
- my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+ my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER;
$accf_arg = pack('a16a240', 'dataready', '');
setsockopt($sock, SOL_SOCKET, $var, $accf_arg) or die "setsockopt: $!";
}
Listen => 1024,
Type => Socket::SOCK_STREAM(),
Local => $_[0],
- );
+ ) or BAIL_OUT "bind + listen $_[0]: $!";
$s->blocking(0);
$s;
}
my $upath = "$tmpdir/s";
my $unix = unix_server($upath);
-ok($unix, 'UNIX socket created');
my $td;
my $spawn_httpd = sub {
my (@args) = @_;
ok($u, 'unix socket connected');
$u->write("GET /host-port HTTP/1.0\r\n\r\n");
$u->read(my $buf, 4096);
- like($buf, qr!\r\n\r\n127\.0\.0\.1:0\z!,
+ like($buf, qr!\r\n\r\n127\.0\.0\.1 0\z!,
'set REMOTE_ADDR and REMOTE_PORT for Unix socket');
}
$conn->write("GET /host-port HTTP/1.0\r\n\r\n");
$conn->read(my $buf, 4096);
my ($head, $body) = split(/\r\n\r\n/, $buf);
- my ($addr, $port) = split(/:/, $body);
- is($addr, $conn->sockhost, 'host matches addr');
+ my ($addr, $port) = split(/ /, $body);
+ is($addr, (tcp_host_port($conn))[0], 'host matches addr');
is($port, $conn->sockport, 'port matches');
}
};
SKIP: {
- my $curl = which('curl') or skip('curl(1) missing', 4);
- my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport;
+ my $curl = require_cmd('curl', 1) or skip('curl(1) missing', 4);
+ my $base = 'http://'.tcp_host_port($sock);
my $url = "$base/sha1";
my ($r, $w);
pipe($r, $w) or die "pipe: $!";
SKIP: {
skip 'SO_ACCEPTFILTER is FreeBSD-only', 1 if $^O ne 'freebsd';
skip 'accf_data not loaded: kldload accf_data' if !defined $accf_arg;
- my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+ my $var = $PublicInbox::Daemon::SO_ACCEPTFILTER;
defined(my $x = getsockopt($sock, SOL_SOCKET, $var)) or die;
is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set');
};
SKIP: {
skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
- my $lsof = which('lsof') or skip 'no lsof in PATH', 1;
+ my $lsof = require_cmd('lsof', 1) or skip 'no lsof in PATH', 1;
my $null_in = '';
my $rdr = { 2 => \(my $null_err), 0 => \$null_in };
my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $rdr);
- is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
+ my $d = [ grep(/\(deleted\)/, @lsof) ];
+ is_deeply($d, [], 'no lingering deleted inputs') or diag explain($d);
# filter out pipes inherited from the parent
my @this = xqx([$lsof, '-p', $$], undef, $rdr);