http: chunk in the server, not middleware

[public-inbox.git] / lib / PublicInbox / HTTP.pm

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 1ef3fb31d8d6f8a61a1482860e33ddf5becc2b65..77b178c07e6fea56cfe47c9b95a7358499f91088 100644 (file)
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -11,7 +11,7 @@ package PublicInbox::HTTP;
 use strict;
 use warnings;
 use base qw(Danga::Socket);
-use fields qw(httpd env rbuf input_left remote_addr remote_port);
+use fields qw(httpd env rbuf input_left remote_addr remote_port forward);
 use Fcntl qw(:seek);
 use Plack::HTTPParser qw(parse_http_request); # XS or pure Perl
 use HTTP::Status qw(status_message);
@@ -180,12 +180,19 @@ sub response_header_write {
 
        my $conn = $env->{HTTP_CONNECTION} || '';
        my $term = 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";
+       my $prot_persist = ($proto eq 'HTTP/1.1') && ($conn !~ /\bclose\b/i);
+       my $alive;
+       if (!$term && $prot_persist) { # auto-chunk
+               $chunked = $alive = 2;
+               $h .= "Transfer-Encoding: chunked\r\n";
+               # no need for "Connection: keep-alive" with HTTP/1.1
+       } elsif ($term && ($prot_persist || ($conn =~ /\bkeep-alive\b/i))) {
+               $alive = 1;
+               $h .= "Connection: keep-alive\r\n";
+       } else {
+               $h .= "Connection: close\r\n";
+       }
+       $h .= 'Date: ' . http_date() . "\r\n\r\n";
 
        if (($len || $chunked) && $env->{REQUEST_METHOD} ne 'HEAD') {
                more($self, $h);
@@ -195,17 +202,33 @@ sub response_header_write {
        $alive;
 }
 
+# middlewares such as Deflater may write empty strings
+sub chunked_wcb ($) {
+       my ($self) = @_;
+       sub {
+               return if $_[0] eq '';
+               more($self, sprintf("%x\r\n", bytes::length($_[0])));
+               more($self, $_[0]);
+               $self->write("\r\n");
+       }
+}
+
+sub identity_wcb ($) {
+       my ($self) = @_;
+       sub { $self->write(\($_[0])) if $_[0] ne '' }
+}
+
 sub response_write {
        my ($self, $env, $res) = @_;
        my $alive = response_header_write($self, $env, $res);
 
-       # middlewares such as Deflater may write empty strings
-       my $write = sub { $self->write($_[0]) if $_[0] ne '' };
+       my $write = $alive == 2 ? chunked_wcb($self) : identity_wcb($self);
        my $close = sub {
+               $self->write("0\r\n\r\n") if $alive == 2;
                if ($alive) {
                        $self->event_write; # watch for readability if done
                } else {
-                       $self->write(sub { $self->close });
+                       Danga::Socket::write($self, sub { $self->close });
                }
                if (my $obj = $env->{'pi-httpd.inbox'}) {
                        # grace period for reaping resources
@@ -215,9 +238,27 @@ sub response_write {
                $self->{env} = undef;
        };
 
-       if (defined $res->[2]) {
-               Plack::Util::foreach($res->[2], $write);
-               $close->();
+       if (defined(my $body = $res->[2])) {
+               if (ref $body eq 'ARRAY') {
+                       $write->($_) foreach @$body;
+                       $close->();
+               } else {
+                       my $pull;
+                       $pull = sub {
+                               local $/ = \8192;
+                               while (defined(my $buf = $body->getline)) {
+                                       $write->($buf);
+                                       if ($self->{write_buf_size}) {
+                                               $self->write($pull);
+                                               return;
+                                       }
+                               }
+                               $pull = undef;
+                               $body->close();
+                               $close->();
+                       };
+                       $pull->();
+               }
        } else {
                # this is returned to the calling application:
                Plack::Util::inline_object(write => $write, close => $close);
@@ -402,7 +443,9 @@ sub event_err { $_[0]->close }
 
 sub close {
        my $self = shift;
-       $self->{env} = undef;
+       my $forward = $self->{forward};
+       $forward->close if $forward;
+       $self->{forward} = $self->{env} = undef;
        $self->SUPER::close(@_);
 }