From e901b85c67912a3fd8d17ac0460a57029439f71d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 29 Apr 2016 04:00:24 +0000 Subject: http: avoid corking on "Content-Length: 0" response We must use a normal write instead of send(.., MSG_MORE) when writing responses of "Content-Length: 0" to avoid the corking effect MSG_MORE provides. We only want to cork headers if we will send a non-empty body. Fixes: c3eeaf664cf0 ("http: clarify intent for persistence") This needs a proper test. --- t/httpd-corner.psgi | 2 ++ t/httpd-corner.t | 13 +++++++++++++ 2 files changed, 15 insertions(+) (limited to 't') diff --git a/t/httpd-corner.psgi b/t/httpd-corner.psgi index da8a2ee8..2f7be832 100644 --- a/t/httpd-corner.psgi +++ b/t/httpd-corner.psgi @@ -56,6 +56,8 @@ my $app = sub { $fh->write($buf); $fh->close; } + } elsif ($path eq '/empty') { + $code = 200; } [ $code, $h, $body ] diff --git a/t/httpd-corner.t b/t/httpd-corner.t index b64f334a..b9eaa6fb 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -5,6 +5,7 @@ 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 HTTP::Date HTTP::Status)) { @@ -274,6 +275,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"); -- cgit v1.2.3-24-ge0c7