lib/Catalyst/Engine.pm
lib/Catalyst/Engine/Apache.pm
lib/Catalyst/Engine/CGI.pm
+lib/Catalyst/Engine/CGI/NPH.pm
lib/Catalyst/Engine/FCGI.pm
lib/Catalyst/Engine/Server.pm
+lib/Catalyst/Engine/Test.pm
lib/Catalyst/Helper.pm
lib/Catalyst/Log.pm
lib/Catalyst/Manual.pod
}
}
+sub run { }
+
=back
=head1 SEE ALSO
sub finalize_headers {
my $c = shift;
- my %headers = ( -nph => 1 );
+ my %headers;
$headers{-status} = $c->response->status if $c->response->status;
for my $name ( $c->response->headers->header_field_names ) {
$headers{"-$name"} = $c->response->headers->header($name);
--- /dev/null
+package Catalyst::Engine::CGI::NPH;
+
+use strict;
+use base 'Catalyst::Engine::CGI';
+
+=head1 NAME
+
+Catalyst::Engine::CGI::NPH - Catalyst CGI Engine
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+This Catalyst engine returns a complete HTTP response message.
+
+=head1 OVERLOADED METHODS
+
+This class overloads some methods from C<Catalyst::Engine::CGI>.
+
+=over 4
+
+=item $c->finalize_headers
+
+=cut
+
+sub finalize_headers {
+ my $c = shift;
+ my %headers = ( -nph => 1 );
+ $headers{-status} = $c->response->status if $c->response->status;
+ for my $name ( $c->response->headers->header_field_names ) {
+ $headers{"-$name"} = $c->response->headers->header($name);
+ }
+ my @cookies;
+ while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) {
+ push @cookies, $c->cgi->cookie(
+ -name => $name,
+ -value => $cookie->{value},
+ -expires => $cookie->{expires},
+ -domain => $cookie->{domain},
+ -path => $cookie->{path},
+ -secure => $cookie->{secure} || 0
+ );
+ }
+ $headers{-cookie} = \@cookies if @cookies;
+ print $c->cgi->header(%headers);
+}
+
+=back
+
+=head1 SEE ALSO
+
+L<Catalyst>, L<Catalyst::Engine::CGI>.
+
+=head1 AUTHOR
+
+Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen, C<ch@ngmedia.com>
+
+=head1 COPYRIGHT
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
+
+1;
my $class = shift;
my $request = FCGI::Request();
while ( $request->Accept() >= 0 ) {
- my $output;
- {
- local (*STDOUT);
- open( STDOUT, '>', \$output );
- $class->NEXT::run;
- }
- $output =~ s!^HTTP/\d+.\d+ \d\d\d.*?\n!!s;
- print $output;
+ $class->handler;
}
}
package Catalyst::Engine::Server;
use strict;
-use base 'Catalyst::Engine::CGI';
+use base 'Catalyst::Engine::CGI::NPH';
=head1 NAME
=head1 OVERLOADED METHODS
-This class overloads some methods from C<Catalyst::Engine::CGI>.
+This class overloads some methods from C<Catalyst::Engine::CGI::NPH>.
=over 4
--- /dev/null
+package Catalyst::Engine::Test;
+
+use strict;
+use base 'Catalyst::Engine::CGI::NPH';
+
+use HTTP::Request;
+use HTTP::Response;
+use IO::File;
+use URI;
+
+=head1 NAME
+
+Catalyst::Engine::Test - Catalyst Test Engine
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+This is the Catalyst engine specialized for testing.
+
+=head1 OVERLOADED METHODS
+
+This class overloads some methods from C<Catalyst::Engine::CGI::NPH>.
+
+=over 4
+
+=item $c->run
+
+=cut
+
+sub run {
+ my $class = shift;
+ my $request = shift || '/';
+
+ unless ( ref $request ) {
+ $request = URI->new( $request, 'http' );
+ }
+ unless ( ref $request eq 'HTTP::Request' ) {
+ $request = HTTP::Request->new( 'GET', $request );
+ }
+
+ local ( *STDIN, *STDOUT );
+
+ my %clean = %ENV;
+ my $output = '';
+ $ENV{CONTENT_TYPE} ||= $request->header('Content-Type') || '';
+ $ENV{CONTENT_LENGTH} ||= $request->header('Content-Length') || '';
+ $ENV{GATEWAY_INTERFACE} ||= 'CGI/1.1';
+ $ENV{HTTP_USER_AGENT} ||= 'Catalyst';
+ $ENV{HTTP_HOST} ||= $request->uri->host || 'localhost';
+ $ENV{QUERY_STRING} ||= $request->uri->query || '';
+ $ENV{REQUEST_METHOD} ||= $request->method;
+ $ENV{PATH_INFO} ||= $request->uri->path || '/';
+ $ENV{SCRIPT_NAME} ||= '/';
+ $ENV{SERVER_NAME} ||= $request->uri->host || 'localhost';
+ $ENV{SERVER_PORT} ||= $request->uri->port;
+ $ENV{SERVER_PROTOCOL} ||= 'HTTP/1.1';
+
+ for my $field ( $request->header_field_names ) {
+ if ( $field =~ /^Content-(Length|Type)$/ ) {
+ next;
+ }
+ $field =~ s/-/_/g;
+ $ENV{ 'HTTP_' . uc($field) } = $request->header($field);
+ }
+
+ if ( $request->content_length ) {
+ my $body = IO::File->new_tmpfile;
+ $body->print( $request->content ) or die $!;
+ $body->seek( 0, SEEK_SET ) or die $!;
+ open( STDIN, "<&=", $body->fileno )
+ or die("Failed to dup \$body: $!");
+ }
+
+ open( STDOUT, '>', \$output );
+ $class->handler;
+ %ENV = %clean;
+ return HTTP::Response->parse($output);
+}
+
+=back
+
+=head1 SEE ALSO
+
+L<Catalyst>.
+
+=head1 AUTHOR
+
+Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen, C<ch@ngmedia.com>
+
+=head1 COPYRIGHT
+
+This program is free software, you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut
+
+1;
$self->mk_file( "$script\/nph-cgi.pl", <<"EOF");
$Config{startperl} -w
-BEGIN { \$ENV{CATALYST_ENGINE} = 'CGI' }
+BEGIN { \$ENV{CATALYST_ENGINE} = 'CGI::NPH' }
use strict;
use FindBin;
$self->mk_file( "$script/test.pl", <<"EOF");
$Config{startperl} -w
+BEGIN { \$ENV{CATALYST_ENGINE} = 'Test' }
+
use strict;
use Getopt::Long;
use Pod::Usage;
use FindBin;
use lib "\$FindBin::Bin/../lib";
+use $name;
my \$help = 0;
pod2usage(1) if ( \$help || !\$ARGV[0] );
-require Catalyst::Test;
-import Catalyst::Test '$name';
-
-print get(\$ARGV[0]) . "\n";
+print $name->run(\$ARGV[0])->content . "\n";
1;
__END__
use strict;
use UNIVERSAL::require;
-use IO::File;
-use HTTP::Request;
-use HTTP::Response;
-use Socket;
-use URI;
require Catalyst;
my $class;
-$ENV{CATALYST_ENGINE} = 'CGI';
=head1 NAME
unless ( $INC{'Test/Builder.pm'} ) {
die qq/Couldn't load "$class", "$@"/ if $@;
}
- my $caller = caller(0);
+
no strict 'refs';
- *{"$caller\::request"} = \&request;
- *{"$caller\::get"} = sub { request(@_)->content };
- }
-}
-sub request {
- my $request = shift;
- unless ( ref $request ) {
- $request = URI->new( $request, 'http' );
- }
- unless ( ref $request eq 'HTTP::Request' ) {
- $request = HTTP::Request->new( 'GET', $request );
- }
- local ( *STDIN, *STDOUT );
- my %clean = %ENV;
- my $output = '';
- $ENV{CONTENT_TYPE} ||= $request->header('Content-Type') || '';
- $ENV{CONTENT_LENGTH} ||= $request->header('Content-Length') || '';
- $ENV{GATEWAY_INTERFACE} ||= 'CGI/1.1';
- $ENV{HTTP_USER_AGENT} ||= 'Catalyst';
- $ENV{HTTP_HOST} ||= $request->uri->host || 'localhost';
- $ENV{QUERY_STRING} ||= $request->uri->query || '';
- $ENV{REQUEST_METHOD} ||= $request->method;
- $ENV{PATH_INFO} ||= $request->uri->path || '/';
- $ENV{SCRIPT_NAME} ||= '/';
- $ENV{SERVER_NAME} ||= $request->uri->host || 'localhost';
- $ENV{SERVER_PORT} ||= $request->uri->port;
- $ENV{SERVER_PROTOCOL} ||= 'HTTP/1.1';
-
- for my $field ( $request->header_field_names ) {
- if ( $field =~ /^Content-(Length|Type)$/ ) {
- next;
+ unless ( $class->engine->isa('Catalyst::Engine::Test') ) {
+ require Catalyst::Engine::Test;
+ splice( @{"$class\::ISA"}, @{"$class\::ISA"} - 1,
+ 0, 'Catalyst::Engine::Test' );
}
- $field =~ s/-/_/g;
- $ENV{ 'HTTP_' . uc($field) } = $request->header($field);
- }
- if ( $request->content_length ) {
- my $body = IO::File->new_tmpfile;
- $body->print( $request->content ) or die $!;
- $body->seek( 0, SEEK_SET ) or die $!;
- open( STDIN, "<&=", $body->fileno )
- or die("Failed to dup \$body: $!");
+
+ my $caller = caller(0);
+ *{"$caller\::request"} = sub { $class->run(@_) };
+ *{"$caller\::get"} = sub { $class->run(@_)->content };
}
- open( STDOUT, '>', \$output );
- $class->handler;
- %ENV = %clean;
- return HTTP::Response->parse($output);
}
=head1 SEE ALSO
projects / catagits/Catalyst-Runtime.git / commitdiff