X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FFastCGI.pm;h=d1fd5f3b671dfa24ec730f24a5beeb317d269527;hb=5898abaea5875aef033ad367d24aaf134090359a;hp=2d11b4446edc3113fb8318a3a36356bee95a5e92;hpb=566ee5d777a655fce380b8fe864a99809f7c8e04;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/FastCGI.pm b/lib/Catalyst/Engine/FastCGI.pm
index 2d11b44..d1fd5f3 100644
--- a/lib/Catalyst/Engine/FastCGI.pm
+++ b/lib/Catalyst/Engine/FastCGI.pm
@@ -1,82 +1,118 @@
 package Catalyst::Engine::FastCGI;
 
 use strict;
-use base qw(Catalyst::Engine::FastCGI::Base Catalyst::Engine::CGI);
+use base 'Catalyst::Engine::CGI';
+use FCGI;
 
 =head1 NAME
 
-Catalyst::Engine::FastCGI - Catalyst FastCGI Engine
-
-=head1 SYNOPSIS
-
-A script using the Catalyst::Engine::FastCGI module might look like:
-
-    #!/usr/bin/perl -w
-
-    BEGIN { 
-       $ENV{CATALYST_ENGINE} = 'FastCGI';
-    }
-
-    use strict;
-    use lib '/path/to/MyApp/lib';
-    use MyApp;
-
-    MyApp->run;
+Catalyst::Engine::FastCGI - FastCGI Engine
 
 =head1 DESCRIPTION
 
-This is the Catalyst engine for FastCGI.
+This is the FastCGI engine.
 
 =head1 OVERLOADED METHODS
 
-This class overloads some methods from C<Catalyst::Engine::FastCGI::Base>
-and C<Catalyst::Engine::CGI>.
+This class overloads some methods from C<Catalyst::Engine::CGI>.
 
 =over 4
 
-=item $c->prepare_body
+=item $self->run($c, $listen, { option => value, ... })
+ 
+Starts the FastCGI server.  If C<$listen> is set, then it specifies a
+location to listen for FastCGI requests;
 
-=cut
+  Form            Meaning
+  /path           listen via Unix sockets on /path
+  :port           listen via TCP on port on all interfaces
+  hostname:port   listen via TCP on port bound to hostname
 
-sub prepare_body { 
-    shift->Catalyst::Engine::CGI::prepare_body(@_);
-}
+Options may also be specified;
 
-=item $c->prepare_parameters
+  Option          Meaning
+  leave_umask     Set to 1 to disable setting umask to 0
+                  for socket open
+  nointr          Do not allow the listener to be
+                  interrupted by Ctrl+C
+  nproc           Specify a number of processes for
+                  FCGI::ProcManager
 
 =cut
 
-sub prepare_parameters { 
-    shift->Catalyst::Engine::CGI::prepare_parameters(@_);
-}
+sub run {
+    my ( $self, $class, $listen, $options ) = @_;
+
+    my $sock;
+    if ($listen) {
+        my $old_umask = umask;
+        unless ( $options->{leave_umask} ) {
+            umask(0);
+        }
+        $sock = FCGI::OpenSocket( $listen, 100 )
+          or die "failed to open FastCGI socket; $!";
+        unless ( $options->{leave_umask} ) {
+            umask($old_umask);
+        }
+    }
+    else {
+        -S STDIN
+          or die "STDIN is not a socket; specify a listen location";
+    }
 
-=item $c->prepare_request
+    $options ||= {};
 
-=cut
+    my $request =
+      FCGI::Request( \*STDIN, \*STDOUT, \*STDERR, \%ENV, $sock,
+        ( $options->{nointr} ? 0 : &FCGI::FAIL_ACCEPT_ON_INTR ),
+      );
+
+    my $proc_manager;
+
+    if ( $listen and ( $options->{nproc} || 1 ) > 1 ) {
+        require FCGI::ProcManager;
+        $proc_manager =
+          FCGI::ProcManager->new( { n_processes => $options->{nproc} } );
+        $proc_manager->pm_manage();
+    }
 
-sub prepare_request {
-    my ( $c, $fastcgi, @arguments ) = @_;
-    CGI::_reset_globals();
-    $c->SUPER::prepare_request($fastcgi);
-    $c->Catalyst::Engine::CGI::prepare_request(@arguments);
+    while ( $request->Accept >= 0 ) {
+        $proc_manager && $proc_manager->pm_pre_dispatch();
+        $class->handle_request;
+        $proc_manager && $proc_manager->pm_pre_dispatch();
+    }
 }
 
-=item $c->prepare_uploads
+=item $self->write($c, $buffer)
 
 =cut
 
-sub prepare_uploads { 
-    shift->Catalyst::Engine::CGI::prepare_uploads(@_);
+sub write {
+    my ( $self, $c, $buffer ) = @_;
+
+    unless ( $self->{_prepared_write} ) {
+        $self->prepare_write($c);
+        $self->{_prepared_write} = 1;
+    }
+
+    # FastCGI does not stream data properly if using 'print $handle',
+    # but a syswrite appears to work properly.
+    *STDOUT->syswrite($buffer);
 }
 
+=back
+
 =head1 SEE ALSO
 
-L<Catalyst>, L<Catalyst::Engine::FastCGI::Base>, L<Catalyst::Engine::CGI>.
+L<Catalyst>, L<FCGI>.
+
+=head1 AUTHORS
+
+Sebastian Riedel, <sri@cpan.org>
 
-=head1 AUTHOR
+Christian Hansen, <ch@ngmedia.com>
 
-Sebastian Riedel, C<sri@cpan.org>
-Christian Hansen, C<ch@ngmedia.com>
+Andy Grundman, <andy@hybridized.org>
 
 =head1 COPYRIGHT