X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FHTTP.pm;h=f685a1ed93fb3bc1d806ab9dc84f8704a2d1d603;hb=83a8fcacf68e1063b5382835f2f9beb93f4bfe87;hp=27873f20a474e33545459f4789e034b76e03b6fb;hpb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm index 27873f2..f685a1e 100644 --- a/lib/Catalyst/Engine/HTTP.pm +++ b/lib/Catalyst/Engine/HTTP.pm @@ -6,6 +6,12 @@ use Errno 'EWOULDBLOCK'; use HTTP::Status; use NEXT; use Socket; +use IO::Socket::INET (); +use IO::Select (); + +# For PAR +require Catalyst::Engine::HTTP::Restarter; +require Catalyst::Engine::HTTP::Restarter::Watcher; =head1 NAME @@ -44,6 +50,8 @@ sub finalize_headers { my $message = status_message($status); print "$protocol $status $message\015\012"; $c->response->headers->date(time); + $c->response->headers->header( + Connection => $self->_keep_alive ? 'keep-alive' : 'close' ); $self->NEXT::finalize_headers($c); } @@ -56,7 +64,7 @@ sub finalize_read { # 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); + *STDIN->blocking(1); return $self->NEXT::finalize_read($c); } @@ -69,7 +77,7 @@ sub prepare_read { my ( $self, $c ) = @_; # Set the input handle to non-blocking - $c->request->handle->blocking(0); + *STDIN->blocking(0); return $self->NEXT::prepare_read($c); } @@ -83,14 +91,13 @@ sub read_chunk { my $c = shift; # support for non-blocking IO - my $handle = $c->request->handle; - my $rin = ''; - vec( $rin, $handle->fileno, 1 ) = 1; + my $rin = ''; + vec( $rin, *STDIN->fileno, 1 ) = 1; READ: { select( $rin, undef, undef, undef ); - my $rc = $handle->sysread(@_); + my $rc = *STDIN->sysread(@_); if ( defined $rc ) { return $rc; } @@ -107,84 +114,129 @@ sub read_chunk { # 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; + my ( $self, $class, $port, $host, $options ) = @_; - local $SIG{HUP} = sub { $GOT_HUP = 1; }; + $options ||= {}; + my $restart = 0; 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 ) { + my $allowed = $options->{allowed} || { '127.0.0.1' => '255.255.255.255' }; + my $addr = $host ? inet_aton($host) : INADDR_ANY; + if ( $addr eq INADDR_ANY ) { require Sys::Hostname; - $url .= lc Sys::Hostname::hostname(); + $host = lc Sys::Hostname::hostname(); } else { - $url .= gethostbyaddr( $host, AF_INET ) || inet_ntoa($host); + $host = gethostbyaddr( $addr, AF_INET ) || inet_ntoa($addr); } - $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 } + # Handle requests + + # Setup socket + my $daemon = IO::Socket::INET->new( + Listen => SOMAXCONN, + LocalAddr => inet_ntoa($addr), + LocalPort => $port, + Proto => 'tcp', + ReuseAddr => 1, + Type => SOCK_STREAM, + ) + or die "Couldn't create daemon: $!"; + + my $url = "http://$host"; + $url .= ":$port" unless $port == 80; + + print "You can connect to your server at $url\n"; - close HTTPDaemon if defined $pid; + $self->_keep_alive( $options->{keepalive} || 0 ); - # Ignore broken pipes as an HTTP server should - local $SIG{PIPE} = sub { close Remote }; - local $SIG{HUP} = (defined $pid ? 'IGNORE' : $SIG{HUP}); + my $parent = $$; + my $pid = undef; + while ( accept( Remote, $daemon ) ) + { # TODO: get while ( my $remote = $daemon->accept ) to work - local *STDIN = \*Remote; - local *STDOUT = \*Remote; - select STDOUT; + select Remote; # 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 ); + + Remote->blocking(1); + next unless my ( $method, $uri, $protocol ) = - $line =~ m/\A(\w+)\s+(\S+)(?:\s+HTTP\/(\d+(?:\.\d+)?))?\z/; + $self->_parse_request_line( \*Remote ); + + unless ( uc($method) eq 'RESTART' ) { + + # Fork + if ( $options->{fork} ) { next if $pid = fork } + + $self->_handler( $class, $port, $method, $uri, $protocol ); + + $daemon->close if defined $pid; + + } + else { + my $sockdata = $self->_socket_data( \*Remote ); + my $ipaddr = _inet_addr( $sockdata->{peeraddr} ); + my $ready = 0; + while ( my ( $ip, $mask ) = each %$allowed and not $ready ) { + $ready = ( $ipaddr & _inet_addr($mask) ) == _inet_addr($ip); + } + if ($ready) { + $restart = 1; + last; + } + } + + exit if defined $pid; + } + continue { + close Remote; + } + $daemon->close; + + if ($restart) { + $SIG{CHLD} = 'DEFAULT'; + wait; + exec $^X . ' "' . $0 . '" ' . join( ' ', @{ $options->{argv} } ); + } - # We better be careful and just use 1.0 - $protocol = '1.0'; + exit; +} + +sub _handler { + my ( $self, $class, $port, $method, $uri, $protocol ) = @_; + + # Ignore broken pipes as an HTTP server should + local $SIG{PIPE} = sub { close Remote }; + + local *STDIN = \*Remote; + local *STDOUT = \*Remote; + # We better be careful and just use 1.0 + $protocol = '1.0'; + + my $sockdata = $self->_socket_data( \*Remote ); + my %copy_of_env = %ENV; + + my $sel = IO::Select->new; + $sel->add( \*STDIN ); + + while (1) { 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, + PATH_INFO => $path || '', + QUERY_STRING => $query_string || '', + REMOTE_ADDR => $sockdata->{peeraddr}, + REMOTE_HOST => $sockdata->{peername}, + REQUEST_METHOD => $method || '', + SERVER_NAME => $sockdata->{localname}, + SERVER_PORT => $port, SERVER_PROTOCOL => "HTTP/$protocol", - %ENV, + %copy_of_env, ); # Parse headers @@ -212,13 +264,59 @@ sub run { # Pass flow control to Catalyst $class->handle_request; - exit if defined $pid; - } - continue { - close Remote; + + my $connection = lc $ENV{HTTP_CONNECTION}; + last + unless $self->_keep_alive() + && index( $connection, 'keep-alive' ) > -1 + && index( $connection, 'te' ) == -1 # opera stuff + && $sel->can_read(5); + + last + unless ( $method, $uri, $protocol ) = + $self->_parse_request_line( \*STDIN ); } - close HTTPDaemon; - exec {$0}( ( ( -x $0 ) ? () : ($^X) ), $0, @ARGV ) if $GOT_HUP; + + close Remote; +} + +sub _keep_alive { + my ( $self, $keepalive ) = @_; + + my $r = $self->{_keepalive} || 0; + $self->{_keepalive} = $keepalive if defined $keepalive; + + return $r; + +} + +sub _parse_request_line { + my ( $self, $handle ) = @_; + + # Parse request line + my $line = $self->_get_line($handle); + return () + unless my ( $method, $uri, $protocol ) = + $line =~ m/\A(\w+)\s+(\S+)(?:\s+HTTP\/(\d+(?:\.\d+)?))?\z/; + return ( $method, $uri, $protocol ); +} + +sub _socket_data { + my ( $self, $handle ) = @_; + + my $remote_sockaddr = getpeername($handle); + my ( undef, $iaddr ) = sockaddr_in($remote_sockaddr); + my $local_sockaddr = getsockname($handle); + my ( undef, $localiaddr ) = sockaddr_in($local_sockaddr); + + my $data = { + peername => gethostbyaddr( $iaddr, AF_INET ) || "localhost", + peeraddr => inet_ntoa($iaddr) || "127.0.0.1", + localname => gethostbyaddr( $localiaddr, AF_INET ) || "localhost", + localaddr => inet_ntoa($localiaddr) || "127.0.0.1", + }; + + return $data; } sub _get_line { @@ -236,6 +334,8 @@ sub _get_line { return $line; } +sub _inet_addr { unpack "N*", inet_aton( $_[0] ) } + =back =head1 SEE ALSO @@ -248,6 +348,8 @@ Sebastian Riedel, Dan Kubb, +Sascha Kiefer, + =head1 THANKS Many parts are ripped out of C by Jesse Vincent.