X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-corner.t;h=a720670ec774e00a651db8767b89ac263de1b04c;hb=f886760b1b5c79181143743814a576a8fa5cf4d9;hp=b64f334ab94627acadc140b87c1ebc940978f1fb;hpb=7dd78012da81d48e5e73e56c3255895dfa9de1f5;p=public-inbox.git

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index b64f334a..a720670e 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -1,12 +1,13 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 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 Rack apps.
 use strict;
 use warnings;
 use Test::More;
+use Time::HiRes qw(gettimeofday tv_interval);
 
-foreach my $mod (qw(Plack::Util Plack::Request Plack::Builder Danga::Socket
+foreach my $mod (qw(Plack::Util Plack::Builder Danga::Socket
 			HTTP::Date HTTP::Status)) {
 	eval "require $mod";
 	plan skip_all => "$mod missing for httpd-corner.t" if $@;
@@ -84,6 +85,30 @@ my $spawn_httpd = sub {
 	is($body, "hello world\n", 'callback body matches expected');
 }
 
+{
+	my $conn = conn_for($sock, 'getline-die');
+	$conn->write("GET /getline-die HTTP/1.1\r\nHost: example.com\r\n\r\n");
+	ok($conn->read(my $buf, 8192), 'read some response');
+	like($buf, qr!HTTP/1\.1 200\b[^\r]*\r\n!, 'got some sort of header');
+	is($conn->read(my $nil, 8192), 0, 'read EOF');
+	$conn = undef;
+	my $after = capture($err);
+	is(scalar(grep(/GETLINE FAIL/, @$after)), 1, 'failure logged');
+	is(scalar(grep(/CLOSE FAIL/, @$after)), 1, 'body->close not called');
+}
+
+{
+	my $conn = conn_for($sock, 'close-die');
+	$conn->write("GET /close-die HTTP/1.1\r\nHost: example.com\r\n\r\n");
+	ok($conn->read(my $buf, 8192), 'read some response');
+	like($buf, qr!HTTP/1\.1 200\b[^\r]*\r\n!, 'got some sort of header');
+	is($conn->read(my $nil, 8192), 0, 'read EOF');
+	$conn = undef;
+	my $after = capture($err);
+	is(scalar(grep(/GETLINE FAIL/, @$after)), 0, 'getline not failed');
+	is(scalar(grep(/CLOSE FAIL/, @$after)), 1, 'body->close not called');
+}
+
 {
 	my $conn = conn_for($sock, 'excessive header');
 	$SIG{PIPE} = 'IGNORE';
@@ -218,7 +243,6 @@ my $check_self = sub {
 
 SKIP: {
 	use POSIX qw(dup2);
-	use IO::File;
 	my $have_curl = 0;
 	foreach my $p (split(':', $ENV{PATH})) {
 		-x "$p/curl" or next;
@@ -230,7 +254,7 @@ SKIP: {
 	my $url = 'http://' . $sock->sockhost . ':' . $sock->sockport . '/sha1';
 	my ($r, $w);
 	pipe($r, $w) or die "pipe: $!";
-	my $tout = IO::File->new_tmpfile or die "new_tmpfile: $!";
+	open(my $tout, '+>', undef) or die "open temporary file: $!";
 	my $pid = fork;
 	defined $pid or die "fork: $!";
 	my @cmd = (qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url);
@@ -274,6 +298,18 @@ SKIP: {
 	}
 }
 
+{
+	my $conn = conn_for($sock, 'no TCP_CORK on empty body');
+	$conn->write("GET /empty HTTP/1.1\r\nHost:example.com\r\n\r\n");
+	my $buf = '';
+	my $t0 = [ gettimeofday ];
+	until ($buf =~ /\r\n\r\n/s) {
+		$conn->sysread($buf, 4096, length($buf));
+	}
+	my $elapsed = tv_interval($t0, [ gettimeofday ]);
+	ok($elapsed < 0.190, 'no 200ms TCP cork delay on empty body');
+}
+
 {
 	my $conn = conn_for($sock, 'graceful termination during slow request');
 	$conn->write("PUT /sha1 HTTP/1.0\r\n");
@@ -476,4 +512,13 @@ SKIP: {
 
 done_testing();
 
+sub capture {
+	my ($f) = @_;
+	open my $fh, '+<', $f or die "failed to open $f: $!\n";
+	local $/ = "\n";
+	my @r = <$fh>;
+	truncate($fh, 0) or die "truncate failed on $f: $!\n";
+	\@r
+}
+
 1;