X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FHTTP.pm;h=61ae46ae315239c9f2ef0ecf43c475256d3640b0;hb=57a87bb3b029e5702f5fd0b7925cf6ab9c243596;hp=8f08b8f926e3d968de3061e3c1402424aacc4216;hpb=65586a18685daa023a1a623cf228943e4a4f830d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm
index 8f08b8f..61ae46a 100644
--- a/lib/Catalyst/Engine/HTTP.pm
+++ b/lib/Catalyst/Engine/HTTP.pm
@@ -109,25 +109,24 @@ sub run {
     my ( $self, $class, $port, $host, $options ) = @_;
 
     $options ||= {};
-    
-    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;
@@ -138,21 +137,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 );
@@ -165,57 +155,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 {
@@ -223,11 +239,13 @@ sub run {
     }
     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} } );
     }
+
+    exit;
 }
 
 sub _get_line {
@@ -245,6 +263,8 @@ sub _get_line {
     return $line;
 }
 
+sub _inet_addr { unpack "N*", inet_aton( $_[0] ) }
+
 =back
 
 =head1 SEE ALSO