X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FHTTP.pm;h=41eddda8d647aef9bfce9656bf05495b1fb79fb7;hb=71fd2e0f3e1deee285101b94bf690569c5da21ab;hp=6e8e432bdbdea0bded1a2808a3bb895ece066d6d;hpb=37553dc8c4a1b2113be2f2bc7b3bb701f76bb524;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm index 6e8e432..41eddda 100644 --- a/lib/Catalyst/Engine/HTTP.pm +++ b/lib/Catalyst/Engine/HTTP.pm @@ -3,13 +3,14 @@ package Catalyst::Engine::HTTP; use strict; use base 'Catalyst::Engine::CGI'; use Errno 'EWOULDBLOCK'; -use FindBin; -use File::Find; -use File::Spec; use HTTP::Status; use NEXT; use Socket; +# For PAR +require Catalyst::Engine::HTTP::Restarter; +require Catalyst::Engine::HTTP::Restarter::Watcher; + =head1 NAME Catalyst::Engine::HTTP - Catalyst HTTP Engine @@ -111,42 +112,25 @@ sub read_chunk { sub run { my ( $self, $class, $port, $host, $options ) = @_; - our $GOT_HUP; - local $GOT_HUP = 0; - - local $SIG{HUP} = sub { $GOT_HUP = 1; }; - - # Setup restarter - my $restarter; - if ( $options->{restart} ) { - my $parent = $$; - unless ( $restarter = fork ) { - - # Index parent directory - my $dir = File::Spec->catdir( $FindBin::Bin, '..' ); - - my $regex = $options->{restart_regex}; - my $one = _index( $dir, $regex ); - while (1) { - sleep $options->{restart_delay}; - my $two = _index( $dir, $regex ); - if ( my $file = _compare_index( $one, $two ) ) { - print STDERR qq/File "$file" modified, restarting\n/; - kill( 1, $parent ); - $one = $two; - } - } - } - } + $options ||= {}; + + my $restart = 0; + local $SIG{CHLD} = 'IGNORE'; + + my $allowed = $options->{allowed} || { '127.0.0.1' => '255.255.255.255' }; # 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 ); + socket( HTTPDaemon, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) + || die "Couldn't assign TCP socket: $!"; + setsockopt( HTTPDaemon, SOL_SOCKET, SO_REUSEADDR, pack( "l", 1 ) ) + || die "Couldn't set TCP socket options: $!"; + bind( HTTPDaemon, sockaddr_in( $port, $host ) ) + || die "Couldn't bind socket to $port on $host: $!"; + listen( HTTPDaemon, SOMAXCONN ) + || die "Couldn't listen to socket on $port on $host: $!"; my $url = 'http://'; if ( $host eq INADDR_ANY ) { require Sys::Hostname; @@ -157,21 +141,12 @@ sub run { } $url .= ":$port"; print "You can connect to your server at $url\n"; - my $pid = undef; - while ( accept( Remote, HTTPDaemon ) ) { - - # Fork - if ( $options->{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} ); + my $parent = $$; + my $pid = undef; + while ( accept( Remote, HTTPDaemon ) ) { - local *STDIN = \*Remote; - local *STDOUT = \*Remote; - select STDOUT; + select Remote; # Request data my $remote_sockaddr = getpeername( \*Remote ); @@ -184,57 +159,83 @@ sub run { || "localhost"; my $localaddr = inet_ntoa($localiaddr) || "127.0.0.1"; - STDIN->blocking(1); + Remote->blocking(1); # Parse request line - my $line = $self->_get_line( \*STDIN ); + my $line = $self->_get_line( \*Remote ); 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; + unless ( uc($method) eq 'RESTART' ) { + + # Fork + if ( $options->{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 *STDIN = \*Remote; + local *STDOUT = \*Remote; + + # 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; + } } } + + # Pass flow control to Catalyst + $class->handle_request; + } + else { + my $ipaddr = _inet_addr($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; + } } - # Pass flow control to Catalyst - $class->handle_request; exit if defined $pid; } continue { @@ -242,20 +243,13 @@ sub run { } close HTTPDaemon; - exec {$0}( ( ( -x $0 ) ? () : ($^X) ), $0, @ARGV ) if $GOT_HUP; -} - -sub _compare_index { - my ( $one, $two ) = @_; - my %clone = %$two; - while ( my ( $key, $val ) = each %$one ) { - return $key if ( !$clone{$key} || ( $clone{$key} ne $val ) ); - delete $clone{$key}; - } - if ( keys %clone ) { - return join ' ', keys %clone; + if ($restart) { + $SIG{CHLD} = 'DEFAULT'; + wait; + exec $^X . ' "' . $0 . '" ' . join( ' ', @{ $options->{argv} } ); } - return 0; + + exit; } sub _get_line { @@ -273,24 +267,7 @@ sub _get_line { return $line; } -sub _index { - my ( $dir, $regex ) = @_; - my %index; - finddepth( - { - wanted => sub { - my $file = File::Spec->rel2abs($File::Find::name); - return unless $file =~ /$regex/; - return unless -f $file; - my $time = ( stat $file )[9]; - $index{$file} = $time; - }, - no_chdir => 1 - }, - $dir - ); - return \%index; -} +sub _inet_addr { unpack "N*", inet_aton( $_[0] ) } =back