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
$options ||= {};
- # Setup restarter
- my $restarter;
- if ( $options->{restart} ) {
- my $parent = $$;
- unless ( $restarter = fork ) {
-
- # Prepare
- close STDIN;
- close STDOUT;
-
- # Index parent directory
- my $dir = File::Spec->catdir( $FindBin::Bin, '..' );
-
- my $regex = $options->{restart_regex};
- my $one = _index( $dir, $regex );
- RESTART: while (1) {
- sleep $options->{restart_delay} || 1;
-
- # check if our parent has died
- exit if ( getppid == 1 );
-
- my $two = _index( $dir, $regex );
- my $changes = _compare_index( $one, $two );
- if (@$changes) {
- $one = $two;
-
- # Test modified pm's
- for my $file (@$changes) {
- next unless $file =~ /\.pm$/;
- if ( my $error = _test($file) ) {
- print STDERR
- qq/File "$file" modified, not restarting\n\n/;
- print STDERR '*' x 80, "\n";
- print STDERR $error;
- print STDERR '*' x 80, "\n";
- next RESTART;
- }
- }
-
- # Restart
- my $files = join ', ', @$changes;
- print STDERR qq/File(s) "$files" modified, restarting\n\n/;
- kill( 1, $parent );
- exit;
- }
- }
- }
- }
-
- our $GOT_HUP;
- local $GOT_HUP = 0;
-
- local $SIG{HUP} = sub { $GOT_HUP = 1; };
+ 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') )
- || die "Couldn't assign TCP socket: $!";
+ || die "Couldn't assign TCP socket: $!";
setsockopt( HTTPDaemon, SOL_SOCKET, SO_REUSEADDR, pack( "l", 1 ) )
- || die "Couldn't set TCP socket options: $!";
+ || die "Couldn't set TCP socket options: $!";
bind( HTTPDaemon, sockaddr_in( $port, $host ) )
- || die "Couldn't bind socket to $port on $host: $!";
+ || die "Couldn't bind socket to $port on $host: $!";
listen( HTTPDaemon, SOMAXCONN )
- || die "Couldn't listen to socket on $port on $host: $!";
+ || die "Couldn't listen to socket on $port on $host: $!";
my $url = 'http://';
if ( $host eq INADDR_ANY ) {
require Sys::Hostname;
}
$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 );
|| "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 {
}
close HTTPDaemon;
- if ($GOT_HUP) {
+ if ($restart) {
$SIG{CHLD} = 'DEFAULT';
wait;
- exec {$0}( ( ( -x $0 ) ? () : ($^X) ), $0, @{ $options->{argv} } );
+ exec $^X . ' "' . $0 . '" ' . join( ' ', @{ $options->{argv} } );
}
-}
-sub _compare_index {
- my ( $one, $two ) = @_;
- my %clone = %$two;
- my @changes;
- while ( my ( $key, $val ) = each %$one ) {
- if ( !$clone{$key} || ( $clone{$key} ne $val ) ) {
- push @changes, $key;
- }
- delete $clone{$key};
- }
- for my $key ( keys %clone ) { push @changes, $key }
- return \@changes;
+ exit;
}
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 _test {
- my $file = shift;
- delete $INC{$file};
- local $SIG{__WARN__} = sub { };
- open my $olderr, '>&STDERR';
- open STDERR, '>', File::Spec->devnull;
- eval "require '$file'";
- open STDERR, '>&', $olderr;
- return $@ if $@;
- return 0;
-}
+sub _inet_addr { unpack "N*", inet_aton( $_[0] ) }
=back
projects / catagits/Catalyst-Runtime.git / blobdiff