X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHTTP.pm;h=10e6d6a43b518115c7eece8a5f11e67ebe613fb2;hb=b6f480ed58abc5ae2a426ef4f792621b9d3cf283;hp=729d46fb20bcd3729043de518710bf50650cb342;hpb=af65e06b3ba65952f1223e09b9df0736965bdaeb;p=public-inbox.git
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 729d46fb..10e6d6a4 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2018 all contributors
# License: AGPL-3.0+
#
# Generic PSGI server for convenience. It aims to provide
@@ -10,14 +10,15 @@
package PublicInbox::HTTP;
use strict;
use warnings;
-use base qw(Danga::Socket);
+use base qw(PublicInbox::DS);
use fields qw(httpd env rbuf input_left remote_addr remote_port forward pull);
+use bytes (); # only for bytes::length
use Fcntl qw(:seek);
use Plack::HTTPParser qw(parse_http_request); # XS or pure Perl
use HTTP::Status qw(status_message);
use HTTP::Date qw(time2str);
-use Scalar::Util qw(weaken);
-use IO::File;
+use IO::Handle;
+require PublicInbox::EvCleanup;
use constant {
CHUNK_START => -1, # [a-f0-9]+\r\n
CHUNK_END => -2, # \r\n
@@ -43,7 +44,7 @@ sub process_pipelineq () {
our $MAX_REQUEST_BUFFER = $ENV{GIT_HTTP_MAX_REQUEST_BUFFER} ||
(10 * 1024 * 1024);
-my $null_io = IO::File->new('/dev/null', '<');
+open(my $null_io, '<', '/dev/null') or die "failed to open /dev/null: $!";
my $http_date;
my $prev = 0;
sub http_date () {
@@ -63,7 +64,7 @@ sub new ($$$) {
$self;
}
-sub event_read { # called by Danga::Socket
+sub event_read { # called by PublicInbox::DS
my ($self) = @_;
return event_read_input($self) if defined $self->{env};
@@ -148,7 +149,7 @@ sub app_dispatch {
sysseek($input, 0, SEEK_SET) or
die "BUG: psgi.input seek failed: $!";
}
- # note: NOT $self->{sock}, we want our close (+ Danga::Socket::close),
+ # note: NOT $self->{sock}, we want our close (+ PublicInbox::DS::close),
# to do proper cleanup:
$env->{'psgix.io'} = $self; # only for ->close
my $res = Plack::Util::run_app($self->{httpd}->{app}, $env);
@@ -237,12 +238,14 @@ sub next_request ($) {
}
}
-sub response_done ($$) {
+sub response_done_cb ($$) {
my ($self, $alive) = @_;
- my $env = $self->{env};
- $self->{env} = undef;
- $self->write("0\r\n\r\n") if $alive == 2;
- $self->write(sub { $alive ? next_request($self) : $self->close });
+ sub {
+ my $env = $self->{env};
+ $self->{env} = undef;
+ $self->write("0\r\n\r\n") if $alive == 2;
+ $self->write(sub{$alive ? next_request($self) : $self->close});
+ }
}
sub getline_cb ($$$) {
@@ -254,7 +257,7 @@ sub getline_cb ($$$) {
if ($forward) {
my $buf = eval { $forward->getline };
if (defined $buf) {
- $write->($buf); # may close in Danga::Socket::write
+ $write->($buf); # may close in PublicInbox::DS::write
unless ($self->{closed}) {
my $next = $self->{pull};
if ($self->{write_buf_size}) {
@@ -283,10 +286,8 @@ sub getline_cb ($$$) {
$close->();
}
-sub getline_response {
- my ($self, $body, $write, $close) = @_;
- $self->{forward} = $body;
- weaken($self);
+sub getline_response ($$$) {
+ my ($self, $write, $close) = @_;
my $pull = $self->{pull} = sub { getline_cb($self, $write, $close) };
$pull->();
}
@@ -294,15 +295,15 @@ sub getline_response {
sub response_write {
my ($self, $env, $res) = @_;
my $alive = response_header_write($self, $env, $res);
-
+ my $close = response_done_cb($self, $alive);
my $write = $alive == 2 ? chunked_wcb($self) : identity_wcb($self);
- my $close = sub { response_done($self, $alive) };
if (defined(my $body = $res->[2])) {
if (ref $body eq 'ARRAY') {
$write->($_) foreach @$body;
$close->();
} else {
- getline_response($self, $body, $write, $close);
+ $self->{forward} = $body;
+ getline_response($self, $write, $close);
}
} else {
# this is returned to the calling application:
@@ -317,10 +318,11 @@ sub more ($$) {
if (MSG_MORE && !$self->{write_buf_size}) {
my $n = send($self->{sock}, $_[1], MSG_MORE);
if (defined $n) {
- my $dlen = length($_[1]);
- return 1 if $n == $dlen; # all done!
- $_[1] = substr($_[1], $n, $dlen - $n);
- # fall through to normal write:
+ my $nlen = length($_[1]) - $n;
+ return 1 if $nlen == 0; # all done!
+
+ # PublicInbox::DS::write queues the unwritten substring:
+ return $self->write(substr($_[1], $n, $nlen));
}
}
$self->write($_[1]);
@@ -328,17 +330,19 @@ sub more ($$) {
sub input_prepare {
my ($self, $env) = @_;
- my $input = $null_io;
+ my $input;
my $len = $env->{CONTENT_LENGTH};
if ($len) {
if ($len > $MAX_REQUEST_BUFFER) {
quit($self, 413);
return;
}
- $input = IO::File->new_tmpfile;
+ open($input, '+>', undef);
} elsif (env_chunked($env)) {
$len = CHUNK_START;
- $input = IO::File->new_tmpfile;
+ open($input, '+>', undef);
+ } else {
+ $input = $null_io;
}
# TODO: expire idle clients on ENFILE / EMFILE
@@ -462,7 +466,7 @@ sub quit {
$self->close;
}
-# callbacks for Danga::Socket
+# callbacks for PublicInbox::DS
sub event_hup { $_[0]->close }
sub event_err { $_[0]->close }
@@ -471,7 +475,7 @@ sub close {
my $self = shift;
my $forward = $self->{forward};
my $env = $self->{env};
- delete $env->{'psgix.io'} if $env; # prevent circular referernces
+ delete $env->{'psgix.io'} if $env; # prevent circular references
$self->{pull} = $self->{forward} = $self->{env} = undef;
if ($forward) {
eval { $forward->close };