diff options
author | Eric Wong <e@80x24.org> | 2019-05-08 19:24:07 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-05-08 19:24:07 +0000 |
commit | fe86054ee1e2d93b19762a34ed1aaebe43635ff0 (patch) | |
tree | 6504ddceac55dd03cad09d8bcc2a41eafe8bc273 /lib/PublicInbox/HTTP.pm | |
parent | a316ca7db9fd3ea7dded317ac6d4d0a6bf174fb3 (diff) | |
parent | 90c5a78c8f6239b27c32b816d1cd029196ba2fe2 (diff) | |
download | public-inbox-fe86054ee1e2d93b19762a34ed1aaebe43635ff0.tar.gz |
* origin/danga-bundle: DS: epoll: fix misordered EPOLL_CTL_DEL call DS: drop unused "_undef" sub syscall: drop readahead wrapper build: do not manify DS and Syscall pods DS: handle EINTR in IO::Poll path, too DS: workaround IO::Kqueue EINTR (mis-)handling DS: drop profiling support DS: remove unused fields and functions listener: use EPOLLEXCLUSIVE for listen sockets bundle Danga::Socket and Sys::Syscall
Diffstat (limited to 'lib/PublicInbox/HTTP.pm')
-rw-r--r-- | lib/PublicInbox/HTTP.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm index e73bd810..11bd241e 100644 --- a/lib/PublicInbox/HTTP.pm +++ b/lib/PublicInbox/HTTP.pm @@ -10,7 +10,7 @@ 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); @@ -63,7 +63,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 +148,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); @@ -256,7 +256,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}) { @@ -320,7 +320,7 @@ sub more ($$) { my $nlen = length($_[1]) - $n; return 1 if $nlen == 0; # all done! - # Danga::Socket::write queues the unwritten substring: + # PublicInbox::DS::write queues the unwritten substring: return $self->write(substr($_[1], $n, $nlen)); } } @@ -465,7 +465,7 @@ sub quit { $self->close; } -# callbacks for Danga::Socket +# callbacks for PublicInbox::DS sub event_hup { $_[0]->close } sub event_err { $_[0]->close } |