X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FHTTP.pm;h=27873f20a474e33545459f4789e034b76e03b6fb;hp=b0f10d929911e14e9f18afaf46849f6760b6be87;hb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460;hpb=b26df351ecca539ec3b1e3a6bd54db2736583195 diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm index b0f10d9..27873f2 100644 --- a/lib/Catalyst/Engine/HTTP.pm +++ b/lib/Catalyst/Engine/HTTP.pm @@ -1,9 +1,11 @@ package Catalyst::Engine::HTTP; use strict; -use base 'Catalyst::Engine::Test'; - -use IO::Socket qw(AF_INET INADDR_ANY SOCK_STREAM SOMAXCONN); +use base 'Catalyst::Engine::CGI'; +use Errno 'EWOULDBLOCK'; +use HTTP::Status; +use NEXT; +use Socket; =head1 NAME @@ -27,78 +29,228 @@ A script using the Catalyst::Engine::HTTP module might look like: This is the Catalyst engine specialized for development and testing. -=head1 OVERLOADED METHODS - -This class overloads some methods from C. +=head1 METHODS =over 4 -=item $c->run +=item $self->finalize_headers($c) =cut -$SIG{'PIPE'} = 'IGNORE'; +sub finalize_headers { + my ( $self, $c ) = @_; + my $protocol = $c->request->protocol; + my $status = $c->response->status; + my $message = status_message($status); + print "$protocol $status $message\015\012"; + $c->response->headers->date(time); + $self->NEXT::finalize_headers($c); +} + +=item $self->finalize_read($c) -sub run { - my $class = shift; - my $port = shift || 3000; - - my $daemon = Catalyst::Engine::HTTP::Catalyst->new( - Listen => SOMAXCONN, - LocalPort => $port, - ReuseAddr => 1, - Type => SOCK_STREAM, - ); - - unless ($daemon) { - die("Failed to create daemon: $!\n"); - } +=cut + +sub finalize_read { + my ( $self, $c ) = @_; - my $base = URI->new( $daemon->url )->canonical; + # Never ever remove this, it would result in random length output + # streams if STDIN eq STDOUT (like in the HTTP engine) + $c->request->handle->blocking(1); - printf( "You can connect to your server at %s\n", $base ); + return $self->NEXT::finalize_read($c); +} - while ( my $connection = $daemon->accept ) { +=item $self->prepare_read($c) - $connection->timeout(5); +=cut - while ( my $request = $connection->get_request ) { +sub prepare_read { + my ( $self, $c ) = @_; - $request->uri->scheme('http'); # Force URI::http - $request->uri->host( $request->header('Host') || $base->host ); - $request->uri->port( $base->port ); + # Set the input handle to non-blocking + $c->request->handle->blocking(0); - my $lwp = Catalyst::Engine::Test::LWP->new( - address => $connection->peerhost, - hostname => gethostbyaddr( $connection->peeraddr, AF_INET ), - request => $request, - response => HTTP::Response->new - ); + return $self->NEXT::prepare_read($c); +} - $class->handler($lwp); - $connection->send_response( $lwp->response ); +=item $self->read_chunk($c, $buffer, $length) - if ( $class->debug ) { - $class->log->info( sprintf( "Peer %s:%d",$connection->peerhost, $connection->peerport ) ); - } +=cut + +sub read_chunk { + my $self = shift; + my $c = shift; + + # support for non-blocking IO + my $handle = $c->request->handle; + my $rin = ''; + vec( $rin, $handle->fileno, 1 ) = 1; + + READ: + { + select( $rin, undef, undef, undef ); + my $rc = $handle->sysread(@_); + if ( defined $rc ) { + return $rc; + } + else { + next READ if $! == EWOULDBLOCK; + return; + } + } +} + +=item run + +=cut + +# A very very simple HTTP server that initializes a CGI environment +sub run { + my ( $self, $class, $port, $host, $fork ) = @_; + our $GOT_HUP; + local $GOT_HUP = 0; + + local $SIG{HUP} = sub { $GOT_HUP = 1; }; + + local $SIG{CHLD} = 'IGNORE'; + + # Handle requests + + # Setup socket + $host = $host ? inet_aton($host) : INADDR_ANY; + socket( HTTPDaemon, PF_INET, SOCK_STREAM, getprotobyname('tcp') ); + setsockopt( HTTPDaemon, SOL_SOCKET, SO_REUSEADDR, pack( "l", 1 ) ); + bind( HTTPDaemon, sockaddr_in( $port, $host ) ); + listen( HTTPDaemon, SOMAXCONN ); + my $url = 'http://'; + if ( $host eq INADDR_ANY ) { + require Sys::Hostname; + $url .= lc Sys::Hostname::hostname(); + } + else { + $url .= gethostbyaddr( $host, AF_INET ) || inet_ntoa($host); + } + $url .= ":$port"; + print "You can connect to your server at $url\n"; + my $pid = undef; + while ( accept( Remote, HTTPDaemon ) ) { + + # Fork + if ($fork) { next if $pid = fork } + + close HTTPDaemon if defined $pid; + + # Ignore broken pipes as an HTTP server should + local $SIG{PIPE} = sub { close Remote }; + local $SIG{HUP} = (defined $pid ? 'IGNORE' : $SIG{HUP}); + + local *STDIN = \*Remote; + local *STDOUT = \*Remote; + select STDOUT; + + # Request data + my $remote_sockaddr = getpeername( \*Remote ); + my ( undef, $iaddr ) = sockaddr_in($remote_sockaddr); + my $peername = gethostbyaddr( $iaddr, AF_INET ) || "localhost"; + my $peeraddr = inet_ntoa($iaddr) || "127.0.0.1"; + my $local_sockaddr = getsockname( \*Remote ); + my ( undef, $localiaddr ) = sockaddr_in($local_sockaddr); + my $localname = gethostbyaddr( $localiaddr, AF_INET ) + || "localhost"; + my $localaddr = inet_ntoa($localiaddr) || "127.0.0.1"; + + STDIN->blocking(1); + + # Parse request line + my $line = $self->_get_line( \*STDIN ); + next + unless my ( $method, $uri, $protocol ) = + $line =~ m/\A(\w+)\s+(\S+)(?:\s+HTTP\/(\d+(?:\.\d+)?))?\z/; + + # We better be careful and just use 1.0 + $protocol = '1.0'; + + my ( $path, $query_string ) = split /\?/, $uri, 2; + + # Initialize CGI environment + local %ENV = ( + PATH_INFO => $path || '', + QUERY_STRING => $query_string || '', + REMOTE_ADDR => $peeraddr, + REMOTE_HOST => $peername, + REQUEST_METHOD => $method || '', + SERVER_NAME => $localname, + SERVER_PORT => $port, + SERVER_PROTOCOL => "HTTP/$protocol", + %ENV, + ); + + # Parse headers + if ( $protocol >= 1 ) { + while (1) { + my $line = $self->_get_line( \*STDIN ); + last if $line eq ''; + next + unless my ( $name, $value ) = + $line =~ m/\A(\w(?:-?\w+)*):\s(.+)\z/; + + $name = uc $name; + $name = 'COOKIE' if $name eq 'COOKIES'; + $name =~ tr/-/_/; + $name = 'HTTP_' . $name + unless $name =~ m/\A(?:CONTENT_(?:LENGTH|TYPE)|COOKIE)\z/; + if ( exists $ENV{$name} ) { + $ENV{$name} .= "; $value"; + } + else { + $ENV{$name} = $value; + } + } } - $connection->close; - undef($connection); + # Pass flow control to Catalyst + $class->handle_request; + exit if defined $pid; + } + continue { + close Remote; } + close HTTPDaemon; + exec {$0}( ( ( -x $0 ) ? () : ($^X) ), $0, @ARGV ) if $GOT_HUP; +} + +sub _get_line { + my ( $self, $handle ) = @_; + + my $line = ''; + + while ( sysread( $handle, my $byte, 1 ) ) { + last if $byte eq "\012"; # eol + $line .= $byte; + } + + 1 while $line =~ s/\s\z//; + + return $line; } =back =head1 SEE ALSO -L, L. +L, L. + +=head1 AUTHORS + +Sebastian Riedel, + +Dan Kubb, -=head1 AUTHOR +=head1 THANKS -Sebastian Riedel, C -Christian Hansen, C +Many parts are ripped out of C by Jesse Vincent. =head1 COPYRIGHT @@ -107,13 +259,4 @@ the same terms as Perl itself. =cut -package Catalyst::Engine::HTTP::Catalyst; - -use strict; -use base 'HTTP::Daemon'; - -sub product_tokens { - "Catalyst/$Catalyst::VERSION"; -} - 1;