X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FHTTP.pm;h=0dfc8e32a0f957a11140532dd6bf2e030bcbb7cb;hb=1c6a35b15865e23dbcbb8328df093bc6e50831b6;hp=e1682af9fc6f9b2e86f6c82ecd17ac98fc6cf375;hpb=4a2a4aadf2362d76c59a87b105f0dd2237f017cd;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm index e1682af..0dfc8e3 100644 --- a/lib/Catalyst/Engine/HTTP.pm +++ b/lib/Catalyst/Engine/HTTP.pm @@ -1,12 +1,13 @@ package Catalyst::Engine::HTTP; -use strict; -use base 'Catalyst::Engine::CGI'; +use Moose; +extends 'Catalyst::Engine::CGI'; + use Data::Dump qw(dump); use Errno 'EWOULDBLOCK'; use HTTP::Date (); +use HTTP::Headers; use HTTP::Status; -use NEXT; use Socket; use IO::Socket::INET (); use IO::Select (); @@ -15,9 +16,8 @@ use IO::Select (); require Catalyst::Engine::HTTP::Restarter; require Catalyst::Engine::HTTP::Restarter::Watcher; -sub CHUNKSIZE () { 64 * 1024 } - -sub DEBUG () { $ENV{CATALYST_HTTP_DEBUG} || 0 } +use constant CHUNKSIZE => 64 * 1024; +use constant DEBUG => $ENV{CATALYST_HTTP_DEBUG} || 0; =head1 NAME @@ -52,46 +52,52 @@ sub finalize_headers { my $protocol = $c->request->protocol; my $status = $c->response->status; my $message = status_message($status); - - print "$protocol $status $message\015\012"; - - $c->response->headers->header( Date => HTTP::Date::time2str(time) ); - $c->response->headers->header( - Connection => $self->_keep_alive ? 'keep-alive' : 'close' ); - - $c->response->headers->header( Status => $status ); - - # Avoid 'print() on closed filehandle Remote' warnings when using IE - print $c->response->headers->as_string("\015\012") if *STDOUT->opened(); - print "\015\012" if *STDOUT->opened(); + my $res_headers = $c->response->headers; + + my @headers; + push @headers, "$protocol $status $message"; + + $res_headers->header( Date => HTTP::Date::time2str(time) ); + $res_headers->header( Status => $status ); + + # Should we keep the connection open? + my $connection = $c->request->header('Connection'); + if ( $self->{options}->{keepalive} + && $connection + && $connection =~ /^keep-alive$/i + ) { + $res_headers->header( Connection => 'keep-alive' ); + $self->{_keepalive} = 1; + } + else { + $res_headers->header( Connection => 'close' ); + } + + push @headers, $res_headers->as_string("\x0D\x0A"); + + # Buffer the headers so they are sent with the first write() call + # This reduces the number of TCP packets we are sending + $self->{_header_buf} = join("\x0D\x0A", @headers, ''); } =head2 $self->finalize_read($c) =cut -sub finalize_read { - my ( $self, $c ) = @_; - +before finalize_read => sub { # Never ever remove this, it would result in random length output # streams if STDIN eq STDOUT (like in the HTTP engine) *STDIN->blocking(1); - - return $self->NEXT::finalize_read($c); -} +}; =head2 $self->prepare_read($c) =cut -sub prepare_read { - my ( $self, $c ) = @_; - +before prepare_read => sub { # Set the input handle to non-blocking *STDIN->blocking(0); - - return $self->NEXT::prepare_read($c); -} +}; =head2 $self->read_chunk($c, $buffer, $length) @@ -129,34 +135,34 @@ sub read_chunk { =head2 $self->write($c, $buffer) -Writes the buffer to the client. Can only be called once for a request. +Writes the buffer to the client. =cut -sub write { +around write => sub { + my $orig = shift; my ( $self, $c, $buffer ) = @_; - - # Avoid 'print() on closed filehandle Remote' warnings when using IE - return unless *STDOUT->opened(); - - my $ret; - - # Prepend the headers if they have not yet been sent - if ( my $headers = delete $self->{_header_buf} ) { - DEBUG && warn "write: Wrote headers and first chunk (" . length($headers . $buffer) . " bytes)\n"; - $ret = $self->NEXT::write( $c, $headers . $buffer ); - } - else { - DEBUG && warn "write: Wrote chunk (" . length($buffer) . " bytes)\n"; - $ret = $self->NEXT::write( $c, $buffer ); + + # Avoid 'print() on closed filehandle Remote' warnings when using IE + return unless *STDOUT->opened(); + + # Prepend the headers if they have not yet been sent + if ( my $headers = delete $self->{_header_buf} ) { + $buffer = $headers . $buffer; } - - if ( !$ret ) { + + my $ret = $self->$orig($c, $buffer); + + if ( !defined $ret ) { $self->{_write_error} = $!; + DEBUG && warn "write: Failed to write response ($!)\n"; } - + else { + DEBUG && warn "write: Wrote response ($ret bytes)\n"; + } + return $ret; -} +}; =head2 run @@ -173,7 +179,7 @@ sub run { if ($options->{background}) { my $child = fork; die "Can't fork: $!" unless defined($child); - exit if $child; + return $child if $child; } my $restart = 0; @@ -227,47 +233,65 @@ sub run { } my $pid = undef; - + # Ignore broken pipes as an HTTP server should local $SIG{PIPE} = 'IGNORE'; - + + # Restart on HUP + local $SIG{HUP} = sub { + $restart = 1; + warn "Restarting server on SIGHUP...\n"; + }; + LISTEN: while ( !$restart ) { - while ( accept( Remote, $daemon ) ) { + while ( accept( Remote, $daemon ) ) { DEBUG && warn "New connection\n"; select Remote; Remote->blocking(1); - + # Read until we see all headers $self->{inputbuf} = ''; - + if ( !$self->_read_headers ) { # Error reading, give up + close Remote; next LISTEN; } my ( $method, $uri, $protocol ) = $self->_parse_request_line; - + DEBUG && warn "Parsed request: $method $uri $protocol\n"; - next unless $method; unless ( uc($method) eq 'RESTART' ) { # Fork - if ( $options->{fork} ) { next if $pid = fork } + if ( $options->{fork} ) { + if ( $pid = fork ) { + DEBUG && warn "Forked child $pid\n"; + next; + } + } $self->_handler( $class, $port, $method, $uri, $protocol ); if ( my $error = delete $self->{_write_error} ) { - DEBUG && warn "Write error: $error\n"; close Remote; - next LISTEN; + + if ( !defined $pid ) { + next LISTEN; + } } - $daemon->close if defined $pid; + if ( defined $pid ) { + # Child process, close connection and exit + DEBUG && warn "Child process exiting\n"; + $daemon->close; + exit; + } } else { my $sockdata = $self->_socket_data( \*Remote ); @@ -283,8 +307,6 @@ sub run { last; } } - - exit if defined $pid; } continue { close Remote; @@ -305,7 +327,7 @@ sub run { use Config; $ENV{PERL5LIB} .= join $Config{path_sep}, @INC; - exec $^X . ' "' . $0 . '" ' . join( ' ', @{ $options->{argv} } ); + exec $^X, $0, @{ $options->{argv} }; } exit; @@ -329,7 +351,7 @@ sub _handler { REQUEST: while (1) { my ( $path, $query_string ) = split /\?/, $uri, 2; - + # Initialize CGI environment local %ENV = ( PATH_INFO => $path || '', @@ -388,46 +410,50 @@ sub _handler { sub _read_headers { my $self = shift; - + while (1) { my $read = sysread Remote, my $buf, CHUNKSIZE; - - if ( !$read ) { - DEBUG && warn "EOF or error: $!\n"; + + if ( !defined $read ) { + next if $! == EWOULDBLOCK; + DEBUG && warn "Error reading headers: $!\n"; + return; + } elsif ( $read == 0 ) { + DEBUG && warn "EOF\n"; return; } - + DEBUG && warn "Read $read bytes\n"; $self->{inputbuf} .= $buf; last if $self->{inputbuf} =~ /(\x0D\x0A?\x0D\x0A?|\x0A\x0D?\x0A\x0D?)/s; } - + return 1; } sub _parse_request_line { my $self = shift; - # Parse request line + # Parse request line if ( $self->{inputbuf} !~ s/^(\w+)[ \t]+(\S+)(?:[ \t]+(HTTP\/\d+\.\d+))?[^\012]*\012// ) { return (); } - + my $method = $1; my $uri = $2; my $proto = $3 || 'HTTP/0.9'; - + return ( $method, $uri, $proto ); } sub _parse_headers { my $self = shift; - + # Copy the buffer for header parsing, and remove the header block # from the content buffer. my $buf = $self->{inputbuf}; $self->{inputbuf} =~ s/.*?(\x0D\x0A?\x0D\x0A?|\x0A\x0D?\x0A\x0D?)//s; - + # Parse headers my $headers = HTTP::Headers->new; my ($key, $val); @@ -497,19 +523,15 @@ sub _socket_data { sub _inet_addr { unpack "N*", inet_aton( $_[0] ) } +no Moose; + =head1 SEE ALSO -L, L. +L, L =head1 AUTHORS -Sebastian Riedel, - -Dan Kubb, - -Sascha Kiefer, - -Andy Grundman, +Catalyst Contributors, see Catalyst.pm =head1 THANKS