t/component/controller/action/path.t
t/component/controller/action/private.t
t/component/controller/action/regexp.t
+t/engine/request/body.t
t/engine/request/cookies.t
t/engine/request/headers.t
t/engine/request/parameters.t
*req = \&request;
*res = \&response;
+# For backwards compatibility
+*finalize_output = \&finalize_body;
+
# For statistics
our $COUNT = 1;
our $START = time;
}
my $status = $c->finalize_headers;
- $c->finalize_output;
+ $c->finalize_body;
return $status;
}
+=item $c->finalize_body
+
+Finalize body.
+
+=cut
+
+sub finalize_body { }
+
=item $c->finalize_cookies
Finalize cookies.
sub finalize_headers { }
-=item $c->finalize_output
-
-Finalize output.
-
-=cut
-
-sub finalize_output { }
-
=item $c->handler( $class, $r )
Handles the request.
$c->prepare_request($r);
$c->prepare_path;
$c->prepare_headers;
- $c->prepare_input;
$c->prepare_cookies;
$c->prepare_connection;
+ $c->prepare_action;
my $method = $c->req->method || '';
my $path = $c->req->path || '';
my $hostname = $c->req->hostname || '';
my $address = $c->req->address || '';
+
$c->log->debug(qq/"$method" request for "$path" from $hostname($address)/)
if $c->debug;
- $c->prepare_action;
- $c->prepare_parameters;
+ if ( $c->request->method eq 'POST' and $c->request->content_length ) {
+
+ if ( $c->req->content_type eq 'application/x-www-form-urlencoded' ) {
+ $c->prepare_parameters;
+ }
+ elsif ( $c->req->content_type eq 'multipart/form-data' ) {
+ $c->prepare_parameters;
+ $c->prepare_uploads;
+ }
+ else {
+ $c->prepare_body;
+ }
+ }
+
+ if ( $c->request->method eq 'GET' ) {
+ $c->prepare_parameters;
+ }
if ( $c->debug && keys %{ $c->req->params } ) {
my $t = Text::ASCIITable->new;
$c->log->debug( 'Parameters are', $t->draw );
}
- $c->prepare_uploads;
return $c;
}
if ( $c->debug && @args );
}
+=item $c->prepare_body
+
+Prepare message body.
+
+=cut
+
+sub prepare_body { }
+
=item $c->prepare_connection
Prepare connection.
=cut
-sub prepare_input { }
-
-=item $c->prepare_input
-
-Prepare message body.
-
-=cut
-
sub prepare_parameters { }
=item $c->prepare_path
=over 4
-=item $c->finalize_output
+=item $c->finalize_body
=cut
-sub finalize_output {
+sub finalize_body {
my $c = shift;
$c->apache->print( $c->response->output );
}
+=item $c->prepare_body
+
+=cut
+
+sub prepare_body {
+ my $c = shift;
+
+ my $length = $c->request->content_length;
+ my ( $buffer, $content );
+
+ while ($length) {
+
+ $c->apache->read( $buffer, ( $length < 8192 ) ? $length : 8192 );
+
+ $length -= length($buffer);
+ $content .= $buffer;
+ }
+
+ $c->request->input($content);
+}
+
=item $c->prepare_connection
=cut
$c->request->base( $base->as_string );
}
-=item $c->prepare_request($r)
-
-=cut
-
-sub prepare_request {
- my ( $c, $r ) = @_;
- $c->apache( $ENV{MOD_PERL_API_VERSION} == 2
- ? Apache2::Request->new($r)
- : Apache::Request->new($r) );
-}
-
=item $c->run
=cut
=head1 DESCRIPTION
-This is the Catalyst engine specialized for Apache mod_perl version 1.
+This is the Catalyst engine specialized for Apache mod_perl version 1.3x.
=head1 OVERLOADED METHODS
$c->req->_assign_values( $c->req->uploads, \@uploads );
}
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+ my ( $c, $r ) = @_;
+ $c->apache( Apache::Request->new($r) );
+}
+
=back
=head1 SEE ALSO
=head1 DESCRIPTION
-This is the Catalyst engine specialized for Apache mod_perl version 2.
+This is the Catalyst engine specialized for Apache mod_perl version 1.9x.
=head1 OVERLOADED METHODS
my $c = shift;
my @uploads;
-
- for my $field ( $c->apache->upload ) {
+
+ for my $field ( $c->request->param ) {
for my $upload ( $c->apache->upload($field) ) {
}
}
- $c->req->_assign_values( $c->req->uploads, \@uploads );
+ $c->request->_assign_values( $c->req->uploads, \@uploads );
+}
+
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+ my ( $c, $r ) = @_;
+ $c->apache( Apache::Request->new($r) );
}
=back
$c->req->_assign_values( $c->req->uploads, \@uploads );
}
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+ my ( $c, $r ) = @_;
+ $c->apache( Apache2::Request->new($r) );
+}
+
=back
=head1 SEE ALSO
=over 4
+=item $c->finalize_body
+
+Prints the response output to STDOUT.
+
+=cut
+
+sub finalize_body {
+ my $c = shift;
+ print $c->response->output;
+}
+
=item $c->finalize_headers
=cut
print "\015\012";
}
-=item $c->finalize_output
-
-Prints the response output to STDOUT.
+=item $c->prepare_body
=cut
-sub finalize_output {
+sub prepare_body {
my $c = shift;
- print $c->response->output;
+
+ # XXX this is undocumented in CGI.pm. If Content-Type is not
+ # application/x-www-form-urlencoded or multipart/form-data
+ # CGI.pm will read STDIN into a param, POSTDATA.
+
+ $c->request->input( $c->cgi->param('POSTDATA') );
}
=item $c->prepare_connection
=over 4
+=item $c->finalize_body
+
+=cut
+
+sub finalize_body {
+ my $c = shift;
+ $c->http->response->content( $c->response->output );
+}
+
=item $c->finalize_headers
=cut
}
}
-=item $c->finalize_output
+=item $c->prepare_body
=cut
-sub finalize_output {
+sub prepare_body {
my $c = shift;
- $c->http->response->content( $c->response->output );
+ $c->request->input( $c->http->request->content );
}
=item $c->prepare_connection
$c->req->address( $c->http->address );
}
-=item $c->prepare_input
-
-=cut
-
-sub prepare_input {
- my $c = shift;
-
- return unless
- $c->request->content_length
- and $c->request->content_type
- and $c->request->content_type ne 'application/x-www-form-urlencoded'
- and $c->request->content_type ne 'multipart/form-data';
-
- $c->request->input( $c->http->request->content );
-}
-
=item $c->prepare_headers
=cut
prepare
prepare_request
prepare_path
- prepare_cookies
prepare_headers
+ prepare_cookies
prepare_connection
prepare_action
+ prepare_body
prepare_parameters
prepare_uploads
process
finalize
finalize_headers
- finalize_output
+ finalize_body
These steps are normally overloaded from engine classes, and may also be
extended by plugins. Extending means using multiple inheritance with L<NEXT>.
$req->args;
$req->arguments;
$req->base;
+ $req->body;
$req->content_encoding;
$req->content_length;
$req->content_type;
Contains the url base. This will always have a trailing slash.
+=item $req->body
+
+Shortcut for $req->input.
+
=item $req->content_encoding
Shortcut to $req->headers->content_encoding
=head1 SYNOPSIS
$resp = $c->response;
+ $resp->body;
$resp->content_encoding;
$resp->content_length;
$resp->content_type;
=over 4
+=item $resp->body
+
+Shortcut for $resp->output.
+
=item $resp->content_encoding
Shortcut to $resp->headers->content_encoding
--- /dev/null
+#!perl
+
+use strict;
+use warnings;
+
+use FindBin;
+use lib "$FindBin::Bin/../../lib";
+
+use Test::More tests => 10;
+use Catalyst::Test 'TestApp';
+
+use Catalyst::Request;
+use HTTP::Headers;
+use HTTP::Request::Common;
+
+{
+ my $creq;
+
+ my $request = POST( 'http://localhost/dump/request/',
+ 'Content-Type' => 'text/plain',
+ 'Content' => 'Hello Catalyst'
+ );
+
+ ok( my $response = request($request), 'Request' );
+ ok( $response->is_success, 'Response Successful 2xx' );
+ is( $response->content_type, 'text/plain', 'Response Content-Type' );
+ like( $response->content, qr/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' );
+
+ {
+ no strict 'refs';
+ ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
+ }
+
+ isa_ok( $creq, 'Catalyst::Request' );
+ is( $creq->method, 'POST', 'Catalyst::Request method' );
+ is( $creq->content_type, 'text/plain', 'Catalyst::Request Content-Type' );
+ is( $creq->content_length, $request->content_length, 'Catalyst::Request Content-Length' );
+ is( $creq->input, $request->content, 'Catalyst::Request Content' );
+}
ok( my $response = request($request), 'Request' );
ok( $response->is_success, 'Response Successful 2xx' );
- is( $response->content_type, 'text/plain', 'Response Content-Type' );
+ is( $response->content_type, 'text/plain', 'Response Content-Type' );
like( $response->content, qr/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' );
{
projects / catagits/Catalyst-Runtime.git / commitdiff