Merge remote-tracking branch 'origin/newspeak' into xcpdb

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

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index bc10814e12634c6b21ab693ed14ba0cf8437f1ec..4fbc34ee4768e6be3ef61c131046e518f54a4906 100644 (file)
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -10,13 +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 IO::Handle;
+require PublicInbox::EvCleanup;
 use constant {
        CHUNK_START => -1,   # [a-f0-9]+\r\n
        CHUNK_END => -2,     # \r\n
@@ -62,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};
@@ -140,14 +142,14 @@ sub app_dispatch {
        $env->{REMOTE_ADDR} = $self->{remote_addr};
        $env->{REMOTE_PORT} = $self->{remote_port};
        if (my $host = $env->{HTTP_HOST}) {
-               $host =~ s/:(\d+)\z// and $env->{SERVER_PORT} = $1;
+               $host =~ s/:([0-9]+)\z// and $env->{SERVER_PORT} = $1;
                $env->{SERVER_NAME} = $host;
        }
        if (defined $input) {
                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);
@@ -255,10 +257,10 @@ 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}) {
+                               if (scalar @{$self->{wbuf}}) {
                                        $self->write($next);
                                } else {
                                        PublicInbox::EvCleanup::asap($next);
@@ -313,16 +315,14 @@ use constant MSG_MORE => ($^O eq 'linux') ? 0x8000 : 0;
 sub more ($$) {
        my $self = $_[0];
        return if $self->{closed};
-       if (MSG_MORE && !$self->{write_buf_size}) {
+       if (MSG_MORE && !scalar(@{$self->{wbuf}})) {
                my $n = send($self->{sock}, $_[1], MSG_MORE);
                if (defined $n) {
                        my $nlen = length($_[1]) - $n;
                        return 1 if $nlen == 0; # all done!
-                       eval { $_[1] = substr($_[1], $n, $nlen) };
-                       if ($@) { # modification of read-only value:
-                               return $self->write(substr($_[1], $n, $nlen));
-                       }
-                       # fall through to normal write:
+
+                       # PublicInbox::DS::write queues the unwritten substring:
+                       return $self->write(substr($_[1], $n, $nlen));
                }
        }
        $self->write($_[1]);
@@ -466,11 +466,6 @@ sub quit {
        $self->close;
 }
 
-# callbacks for Danga::Socket
-
-sub event_hup { $_[0]->close }
-sub event_err { $_[0]->close }
-
 sub close {
        my $self = shift;
        my $forward = $self->{forward};
@@ -487,7 +482,7 @@ sub close {
 # for graceful shutdown in PublicInbox::Daemon:
 sub busy () {
        my ($self) = @_;
-       ($self->{rbuf} ne '' || $self->{env} || $self->{write_buf_size});
+       ($self->{rbuf} ne '' || $self->{env} || scalar(@{$self->{wbuf}}));
 }
 
 1;