public-inbox 1.3.0

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

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 4ed34934e500649470ba411629764afbe286f044..cb813897c025d6eca82d2da81ede68fc8ce64903 100644 (file)
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # 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.
@@ -28,10 +28,11 @@ open(STDIN, '<', '/dev/null') or die 'no /dev/null: $!';
 
 # Make sure we don't clobber socket options set by systemd or similar
 # using socket activation:
-my ($defer_accept_val, $accf_arg);
+my ($defer_accept_val, $accf_arg, $TCP_DEFER_ACCEPT);
 if ($^O eq 'linux') {
-       setsockopt($sock, IPPROTO_TCP, Socket::TCP_DEFER_ACCEPT(), 5) or die;
-       my $x = getsockopt($sock, IPPROTO_TCP, Socket::TCP_DEFER_ACCEPT());
+       $TCP_DEFER_ACCEPT = eval { Socket::TCP_DEFER_ACCEPT() } // 9;
+       setsockopt($sock, IPPROTO_TCP, $TCP_DEFER_ACCEPT, 5) or die;
+       my $x = getsockopt($sock, IPPROTO_TCP, $TCP_DEFER_ACCEPT);
        defined $x or die "getsockopt: $!";
        $defer_accept_val = unpack('i', $x);
        if ($defer_accept_val <= 0) {
@@ -277,7 +278,7 @@ SKIP: {
        waitpid($pid, 0);
        is($?, 0, 'curl exited successfully');
        is(-s $cerr, 0, 'no errors from curl');
-       $cout->seek(0, SEEK_SET);
+       seek($cout, 0, SEEK_SET);
        is(<$cout>, sha1_hex($str), 'read expected body');
 
        open my $fh, '-|', qw(curl -sS), "$base/async-big" or die $!;
@@ -526,7 +527,7 @@ SKIP: {
 
 SKIP: {
        skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux';
-       my $var = Socket::TCP_DEFER_ACCEPT();
+       my $var = $TCP_DEFER_ACCEPT;
        defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die;
        is(unpack('i', $x), $defer_accept_val,
                'TCP_DEFER_ACCEPT unchanged if previously set');