daemon: provide TCP_DEFER_ACCEPT for Perl <5.14

[public-inbox.git] / t / httpd.t

diff --git a/t/httpd.t b/t/httpd.t
index d55495ff6137e18c296c61b7a3f60e4a682759d7..2972afb26a33cba68569a37fbd8415703c49b36c 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -1,20 +1,14 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-
-foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for httpd.t" if $@;
-}
-use File::Temp qw/tempdir/;
-use Cwd qw/getcwd/;
-use IO::Socket::INET;
-require './t/common.perl';
+use PublicInbox::TestCommon;
+use Socket qw(IPPROTO_TCP SOL_SOCKET);
+require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
 
 # FIXME: too much setup
-my $tmpdir = tempdir('pi-httpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
@@ -22,26 +16,15 @@ my $maindir = "$tmpdir/main.git";
 my $group = 'test-httpd';
 my $addr = $group . '@example.com';
 my $cfgpfx = "publicinbox.$group";
-my $httpd = 'blib/script/public-inbox-httpd';
-my $init = 'blib/script/public-inbox-init';
-
-my %opts = (
-       LocalAddr => '127.0.0.1',
-       ReuseAddr => 1,
-       Proto => 'tcp',
-       Type => SOCK_STREAM,
-       Listen => 1024,
-);
-my $sock = IO::Socket::INET->new(%opts);
-my $pid;
+my $sock = tcp_server();
+my $td;
 use_ok 'PublicInbox::Git';
 use_ok 'PublicInbox::Import';
 use_ok 'Email::MIME';
-END { kill 'TERM', $pid if defined $pid };
 {
        local $ENV{HOME} = $home;
-       ok(!system($init, $group, $maindir, 'http://example.com/', $addr),
-               'init ran properly');
+       my $cmd = [ '-init', $group, $maindir, 'http://example.com/', $addr ];
+       ok(run_script($cmd), 'init ran properly');
 
        # ensure successful message delivery
        {
@@ -62,14 +45,11 @@ EOF
                $im->done($mime);
        }
        ok($sock, 'sock created');
-       my $cmd = [ $httpd, "--stdout=$out", "--stderr=$err" ];
-       $pid = spawn_listener(undef, $cmd, [$sock]);
+       $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+       $td = start_script($cmd, undef, { 3 => $sock });
        my $host = $sock->sockhost;
        my $port = $sock->sockport;
-       my $conn = IO::Socket::INET->new(PeerAddr => $host,
-                               PeerPort => $port,
-                               Proto => 'tcp',
-                               Type => SOCK_STREAM);
+       my $conn = tcp_connect($sock);
        ok($conn, 'connected');
        ok($conn->write("GET / HTTP/1.0\r\n\r\n"), 'wrote data to socket');
        {
@@ -91,15 +71,31 @@ EOF
                        "http://$host:$port/$group", "$tmpdir/dumb.git"),
                0, 'clone successful');
 
-       ok(kill('TERM', $pid), 'killed httpd');
-       $pid = undef;
-       waitpid(-1, 0);
+       ok($td->kill, 'killed httpd');
+       $td->join;
 
        is(system('git', "--git-dir=$tmpdir/clone.git",
                  qw(fsck --no-verbose)), 0,
                'fsck on cloned directory successful');
 }
 
+SKIP: {
+       skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux';
+       my $var = eval { Socket::TCP_DEFER_ACCEPT() } // 9;
+       defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die;
+       ok(unpack('i', $x) > 0, 'TCP_DEFER_ACCEPT set');
+};
+SKIP: {
+       skip 'SO_ACCEPTFILTER is FreeBSD-only', 1 if $^O ne 'freebsd';
+       if (system('kldstat -m accf_http >/dev/null') != 0) {
+               skip 'accf_http not loaded: kldload accf_http', 1;
+       }
+       require PublicInbox::Daemon;
+       my $var = PublicInbox::Daemon::SO_ACCEPTFILTER();
+       my $x = getsockopt($sock, SOL_SOCKET, $var);
+       like($x, qr/\Ahttpready\0+\z/, 'got httpready accf for HTTP');
+};
+
 done_testing();
 
 1;