From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] http: clarify intent for persistence
Date: Wed, 6 Apr 2016 06:26:43 +0000 [thread overview]
Message-ID: <20160406062643.12394-1-e@80x24.org> (raw)
We don't actually need to know if a response is chunked or
what the actual Content-Length is; we just need to know if
the PSGI app properly terminated the response so we can
handle persistent connections.
---
lib/PublicInbox/HTTP.pm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 68c3b78..3934512 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -151,7 +151,7 @@ sub response_header_write {
my $proto = $env->{SERVER_PROTOCOL} or return; # HTTP/0.9 :P
my $status = $res->[0];
my $h = "$proto $status " . status_message($status) . "\r\n";
- my ($len, $chunked);
+ my $term;
my $headers = $res->[1];
for (my $i = 0; $i < @$headers; $i += 2) {
@@ -159,33 +159,32 @@ sub response_header_write {
my $v = $headers->[$i + 1];
next if $k =~ /\A(?:Connection|Date)\z/i;
- $len = $v if $k =~ /\AContent-Length\z/i;
- if ($k =~ /\ATransfer-Encoding\z/i && $v =~ /\bchunked\b/i) {
- $chunked = 1;
+ if ($k =~ /\AContent-Length\z/ ||
+ ($k =~ /\ATransfer-Encoding\z/i && $v =~ /\bchunked\b/i)) {
+ $term = 1;
}
-
$h .= "$k: $v\r\n";
}
my $conn = $env->{HTTP_CONNECTION} || '';
- my $alive = (defined($len) || $chunked) &&
+ my $alive = $term &&
(($proto eq 'HTTP/1.1' && $conn !~ /\bclose\b/i) ||
($conn =~ /\bkeep-alive\b/i));
$h .= 'Connection: ' . ($alive ? 'keep-alive' : 'close');
$h .= "\r\nDate: " . http_date() . "\r\n\r\n";
- if (($len || $chunked) && $env->{REQUEST_METHOD} ne 'HEAD') {
+ if ($term && $env->{REQUEST_METHOD} ne 'HEAD') {
more($self, $h);
} else {
$self->write($h);
}
- ($alive, $chunked);
+ $alive;
}
sub response_write {
my ($self, $env, $res) = @_;
- my ($alive, $chunked) = response_header_write($self, $env, $res);
+ my $alive = response_header_write($self, $env, $res);
my $write = sub { $self->write($_[0]) };
my $close = sub {
if ($alive) {
--
EW
reply other threads:[~2016-04-06 6:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160406062643.12394-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).