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=b708a7ff0837a722401afeac5bb78acfcc5d3d19;hp=8d5cf4415792b62c0683222f14f8deb857fcbba4;hb=5bf293276098f2b467162c75182eb3bc3f7b0119;hpb=4eeca0f22817aebad0ddfbcd1ce2ed0a446443d6 diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm index 8d5cf44..b708a7f 100644 --- a/lib/Catalyst/Engine/HTTP.pm +++ b/lib/Catalyst/Engine/HTTP.pm @@ -1,360 +1,23 @@ -package Catalyst::Engine::HTTP; - +package # Hide from PAUSE + 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; - -=head1 NAME - -Catalyst::Engine::HTTP - Catalyst HTTP Engine - -=head1 SYNOPSIS - -A script using the Catalyst::Engine::HTTP module might look like: - - #!/usr/bin/perl -w - - BEGIN { $ENV{CATALYST_ENGINE} = 'HTTP' } - - use strict; - use lib '/path/to/MyApp/lib'; - use MyApp; - - MyApp->run; - -=head1 DESCRIPTION - -This is the Catalyst engine specialized for development and testing. - -=head1 METHODS - -=over 4 - -=item $self->finalize_headers($c) - -=cut - -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) - -=cut - -sub finalize_read { - my ( $self, $c ) = @_; - - # Never ever remove this, it would result in random length output - # streams if STDIN eq STDOUT (like in the HTTP engine) - *STDIN->blocking(1); - - return $self->NEXT::finalize_read($c); -} - -=item $self->prepare_read($c) - -=cut - -sub prepare_read { - my ( $self, $c ) = @_; - - # Set the input handle to non-blocking - *STDIN->blocking(0); - - return $self->NEXT::prepare_read($c); -} - -=item $self->read_chunk($c, $buffer, $length) - -=cut - -sub read_chunk { - my $self = shift; - my $c = shift; - - # support for non-blocking IO - my $rin = ''; - vec( $rin, *STDIN->fileno, 1 ) = 1; - - READ: - { - select( $rin, undef, undef, undef ); - my $rc = *STDIN->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, $options ) = @_; - - $options ||= {}; - - our $GOT_HUP; - local $GOT_HUP = 0; +use warnings; - local $SIG{HUP} = sub { $GOT_HUP = 1; }; - local $SIG{CHLD} = 'IGNORE'; +use base 'Catalyst::Engine'; - # Setup restarter - my $restarter; - if ( $options->{restart} ) { - my $parent = $$; - unless ( $restarter = fork ) { +warn("You are loading Catalyst::Engine::HTTP explicitly. - # Prepare - close STDIN; - close STDOUT; +This is almost certainly a bad idea, as Catalyst::Engine::HTTP +has been removed in this version of Catalyst. - # Index parent directory - my $dir = File::Spec->catdir( $FindBin::Bin, '..' ); +Please update your application's scripts with: - my $regex = $options->{restart_regex}; - my $one = _index( $dir, $regex ); - RESTART: while (1) { - sleep $options->{restart_delay}; - my $two = _index( $dir, $regex ); - my $changes = _compare_index( $one, $two ); - if (@$changes) { - $one = $two; + catalyst.pl -force -scripts MyApp - # 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; - } - } +to update your scripts to not do this.\n") unless $ENV{HARNESS_ACTIVE}; - # Restart - my $files = join ', ', @$changes; - print STDERR qq/File(s) "$files" modified, restarting\n\n/; - kill( 1, $parent ); - exit; - } - } - } - } - - # 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 ( $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} ); - - 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; - } - } - } - - # Pass flow control to Catalyst - $class->handle_request; - exit if defined $pid; - } - continue { - close Remote; - } - close HTTPDaemon; - - if ($GOT_HUP) { - $SIG{CHLD} = 'DEFAULT'; - wait; - exec {$0}( ( ( -x $0 ) ? () : ($^X) ), $0, @{ $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; -} - -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; -} - -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; -} - -=back - -=head1 SEE ALSO - -L, L. - -=head1 AUTHORS - -Sebastian Riedel, - -Dan Kubb, - -=head1 THANKS - -Many parts are ripped out of C by Jesse Vincent. - -=head1 COPYRIGHT +1; -This program is free software, you can redistribute it and/or modify it under -the same terms as Perl itself. +# This is here only as some old generated scripts require Catalyst::Engine::HTTP -=cut -1;