while (1) {
- for my $client ( $select->can_read ) {
+ for my $client ( $select->can_read(1) ) {
if ( $client == $daemon ) {
$client = $daemon->accept;
+ $client->timestamp = time;
$client->blocking(0);
$select->add($client);
}
next if $client->request;
next if $client->response;
- my $read = $client->sysread( my $buf, 4096 );
-
- unless ( defined($read) && length($buf) ) {
-
+ my $nread = $client->sysread( my $buf, 4096 );
+
+ unless ( defined($nread) && length($buf) ) {
+
$select->remove($client);
$client->close;
next;
}
- $client->read_buffer($buf);
- $client->request( $client->get_request );
+ $client->request_buffer .= $buf;
+
+ if ( my $request = $client->get_request ) {
+ $client->request = $request;
+ $client->timestamp = time
+ }
}
}
for my $client ( $select->handles ) {
next if $client == $daemon;
+
+ if ( ( time - $client->timestamp ) > 60 ) {
+
+ $select->remove($client);
+ $client->close;
+
+ next;
+ }
+
next if $client->response;
next unless $client->request;
- $client->response( HTTP::Response->new );
- $class->handler( $client->request, $client->response, $client );
+ $client->response = HTTP::Response->new;
+ $client->response->protocol( $client->request->protocol );
+
+ $class->handler( $client->request, $client->response, $client );
}
- for my $client ( $select->can_write(0) ) {
+ for my $client ( $select->can_write(1) ) {
next unless $client->response;
- $client->send_response( $client->response );
+ unless ( $client->response_buffer ) {
+ $client->response_buffer = $client->response->as_string;
+ $client->response_offset = 0;
+ }
+
+ my $nwrite = $client->syswrite( $client->response_buffer,
+ $client->response_length,
+ $client->response_offset );
- my $connection = $client->request->header('Connection');
+ unless ( defined($nwrite) ) {
- unless ( $connection && $connection =~ /Keep-Alive/i ) {
$select->remove($client);
$client->close;
+
+ next;
}
- $client->request(undef);
- $client->response(undef);
+ $client->response_offset += $nwrite;
+
+ if ( $client->response_offset == $client->response_length ) {
+
+ my $connection = $client->request->header('Connection');
+
+ unless ( $connection && $connection =~ /Keep-Alive/i ) {
+ $select->remove($client);
+ $client->close;
+ }
+
+ $client->response = undef;
+ $client->request = undef;
+ $client->response_buffer = undef;
+ }
}
}
}
use strict;
use base 'HTTP::Daemon::ClientConn';
-sub read_buffer {
+sub request : lvalue {
my $self = shift;
-
- if (@_) {
- ${*$self}{'httpd_rbuf'} .= shift;
- }
-
- return ${*$self}{'httpd_rbuf'};
+ ${*$self}{'request'};
}
-sub request {
+sub request_buffer : lvalue {
my $self = shift;
+ ${*$self}{'httpd_rbuf'};
+}
- if (@_) {
- ${*$self}{'request'} = shift;
- }
+sub response : lvalue {
+ my $self = shift;
+ ${*$self}{'response'};
+}
- return ${*$self}{'request'};
+sub response_buffer : lvalue {
+ my $self = shift;
+ ${*$self}{'httpd_wbuf'};
}
-sub response {
+sub response_length {
my $self = shift;
+ return length( $self->response_buffer );
+}
- if (@_) {
- ${*$self}{'response'} = shift;
- }
+sub response_offset : lvalue {
+ my $self = shift;
+ ${*$self}{'httpd_woffset'};
+}
- return ${*$self}{'response'};
+sub timestamp : lvalue {
+ my $self = shift;
+ ${*$self}{'timestamp'};
}
1;