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);
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);
$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 {
if (ref $body eq 'ARRAY') {
$write->($_) foreach @$body;
$close->();
- } elsif ($body->can('async_pass')) { # HTTPD::Async
- # prevent us from reading the body faster than we
- # can write to the client
- my $restart_read = sub { $body->watch_read(1) };
- $body->async_pass(sub {
- local $/ = \8192;
- my $buf = $body->getline;
- if (defined $buf) {
- $write->($buf);
- if ($self->{write_buf_size}) {
- $body->watch_read(0);
- $self->write($restart_read);
- }
- return; # continue waiting
- }
- $body->close;
- $close->();
- });
} else {
my $pull;
$pull = sub {
sub close {
my $self = shift;
- $self->{env} = undef;
+ my $forward = $self->{forward};
+ $forward->close if $forward;
+ $self->{forward} = $self->{env} = undef;
$self->SUPER::close(@_);
}