X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit-http-backend.t;h=c2a0465335c5b7cf94ffa782553995703b7dd50d;hb=826a69a8c5c46278c10f1f9670edc4b953f3f88f;hp=b616e822bfb1fb5cfc2451673429eebce264a1c6;hpb=cd50d183273c105a7f08b1875ba6f7a51d9f8e9a;p=public-inbox.git
diff --git a/t/git-http-backend.t b/t/git-http-backend.t
index b616e822..c2a04653 100644
--- a/t/git-http-backend.t
+++ b/t/git-http-backend.t
@@ -1,36 +1,29 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2019 all contributors
# License: AGPL-3.0+
+#
+# Ensure buffering behavior in -httpd doesn't cause runaway memory use
+# or data corruption
use strict;
use warnings;
use Test::More;
use File::Temp qw/tempdir/;
-use IO::Socket;
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-use POSIX qw(dup2 setsid);
-use Cwd qw(getcwd);
+use POSIX qw(setsid);
my $git_dir = $ENV{GIANT_GIT_DIR};
plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir;
-foreach my $mod (qw(PublicInbox::DS BSD::Resource
+foreach my $mod (qw(BSD::Resource
Plack::Util Plack::Builder
HTTP::Date HTTP::Status Net::HTTP)) {
eval "require $mod";
plan skip_all => "$mod missing for git-http-backend.t" if $@;
}
require './t/common.perl';
-my $psgi = getcwd()."/t/git-http-backend.psgi";
+my $psgi = "./t/git-http-backend.psgi";
my $tmpdir = tempdir('pi-git-http-backend-XXXXXX', TMPDIR => 1, CLEANUP => 1);
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $httpd = 'blib/script/public-inbox-httpd';
-my %opts = (
- LocalAddr => '127.0.0.1',
- ReuseAddr => 1,
- Proto => 'tcp',
- Type => SOCK_STREAM,
- Listen => 1024,
-);
-my $sock = IO::Socket::INET->new(%opts);
+my $sock = tcp_server();
my $host = $sock->sockhost;
my $port = $sock->sockport;
my $pid;
@@ -51,7 +44,7 @@ my $get_maxrss = sub {
{
ok($sock, 'sock created');
- my $cmd = [ $httpd, "--stdout=$out", "--stderr=$err", $psgi ];
+ my $cmd = [ $httpd, '-W0', "--stdout=$out", "--stderr=$err", $psgi ];
ok(defined($pid = spawn_listener(undef, $cmd, [$sock])),
'forked httpd process successfully');
}
@@ -79,6 +72,8 @@ SKIP: {
my ($code, $mess, %h) = $http->read_response_headers;
is(200, $code, 'got 200 success for pack');
is($max, $h{'Content-Length'}, 'got expected Content-Length for pack');
+
+ # no $http->read_entity_body, here, since we want to force buffering
foreach my $i (1..3) {
sleep 1;
my $diff = $get_maxrss->() - $mem_a;