package Catalyst::Engine::Apache;
use strict;
-use mod_perl;
-use constant MP2 => $mod_perl::VERSION >= 1.99;
use base 'Catalyst::Engine';
-use URI;
-
-# mod_perl
-if (MP2) {
- require Apache2;
- require Apache::RequestIO;
- require Apache::RequestRec;
- require Apache::SubRequest;
- require Apache::RequestUtil;
- require APR::URI;
- require Apache::URI;
-}
-else { require Apache }
-# libapreq
-require Apache::Request;
-require Apache::Cookie;
-require Apache::Upload if MP2;
+use URI;
+use URI::http;
-__PACKAGE__->mk_accessors(qw/apache_request original_request/);
+__PACKAGE__->mk_accessors(qw/apache/);
=head1 NAME
=head1 DESCRIPTION
-The Apache Engine.
+This is a base class engine specialized for Apache (i.e. for mod_perl).
-=head2 METHODS
+=head1 METHODS
-=head3 apache_request
+=over 4
-Returns an C<Apache::Request> object.
+=item $c->apache
-=head3 original_request
+Returns an C<Apache::Request> object.
-Returns the original Apache request object.
+=back
-=head2 OVERLOADED METHODS
+=head1 OVERLOADED METHODS
This class overloads some methods from C<Catalyst::Engine>.
-=head3 finalize_headers
+=over 4
+
+=item $c->finalize_body
=cut
-sub finalize_headers {
+sub finalize_body {
my $c = shift;
- for my $name ( $c->response->headers->header_field_names ) {
- next if $name =~ /Content-Type/i;
- $c->original_request->headers_out->set(
- $name => $c->response->headers->header($name) );
- }
- while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) {
- my %cookie = ( -name => $name, -value => $cookie->{value} );
- $cookie->{-expires} = $cookie->{expires} if $cookie->{expires};
- $cookie->{-domain} = $cookie->{domain} if $cookie->{domain};
- $cookie->{-path} = $cookie->{path} if $cookie->{path};
- $cookie->{-secure} = $cookie->{secure} if $cookie->{secure};
- my $cookie = Apache::Cookie->new( $c->original_request, %cookie );
- MP2
- ? $c->apache_request->err_headers_out->add(
- 'Set-Cookie' => $cookie->as_string )
- : $cookie->bake;
- }
- $c->original_request->status( $c->response->status );
- $c->original_request->content_type( $c->response->headers->content_type
- || 'text/plain' );
- MP2 || $c->apache_request->send_http_header;
- return 0;
+ $c->apache->print( $c->response->body );
}
-=head3 finalize_output
+=item $c->prepare_body
=cut
-sub finalize_output {
+sub prepare_body {
my $c = shift;
- $c->original_request->print( $c->response->{output} );
+
+ 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->body($content);
}
-=head3 prepare_cookies
+=item $c->prepare_connection
=cut
-sub prepare_cookies {
+sub prepare_connection {
my $c = shift;
- MP2
- ? $c->req->cookies( { Apache::Cookie->fetch } )
- : $c->req->cookies(
- { Apache::Cookie->new( $c->apache_request )->fetch } );
+ $c->request->hostname( $c->apache->connection->remote_host );
+ $c->request->address( $c->apache->connection->remote_ip );
}
-=head3 prepare_headers
+=item $c->prepare_headers
=cut
sub prepare_headers {
my $c = shift;
- $c->req->method( $c->apache_request->method );
- $c->req->headers->header( %{ $c->apache_request->headers_in } );
+ $c->request->method( $c->apache->method );
+ $c->request->header( %{ $c->apache->headers_in } );
}
-=head3 prepare_parameters
+=item $c->prepare_parameters
=cut
sub prepare_parameters {
my $c = shift;
- my %args;
- foreach my $key ( $c->apache_request->param ) {
- my @values = $c->apache_request->param($key);
- $args{$key} = @values == 1 ? $values[0] : \@values;
+
+ foreach my $key ( $c->apache->param ) {
+ my @values = $c->apache->param($key);
+ $c->req->parameters->{$key} = ( @values == 1 ) ? $values[0] : \@values;
}
- $c->req->parameters( \%args );
}
-=head3 prepare_path
+=item $c->prepare_path
=cut
+# XXX needs fixing, only work with <Location> directive,
+# not <Directory> directive
sub prepare_path {
my $c = shift;
- $c->req->path( $c->apache_request->uri );
- my $loc = $c->apache_request->location;
+ $c->request->path( $c->apache->uri );
+ my $loc = $c->apache->location;
no warnings 'uninitialized';
$c->req->{path} =~ s/^($loc)?\///;
my $base = URI->new;
$base->scheme( $ENV{HTTPS} ? 'https' : 'http' );
- $base->host( $c->apache_request->hostname );
- $base->port( $c->apache_request->get_server_port );
- my $path = $c->apache_request->location;
+ $base->host( $c->apache->hostname );
+ $base->port( $c->apache->get_server_port );
+ my $path = $c->apache->location;
$base->path( $path =~ /\/$/ ? $path : "$path/" );
- $c->req->base( $base->as_string );
+ $c->request->base( $base->as_string );
}
-=head3 prepare_request
+=item $c->run
=cut
-sub prepare_request {
- my ( $c, $r ) = @_;
- $c->apache_request( Apache::Request->new($r) );
- $c->original_request($r);
-}
-
-=head3 prepare_uploads
+sub run { }
-=cut
-
-sub prepare_uploads {
- my $c = shift;
- for my $upload ( $c->apache_request->upload ) {
- $upload = $c->apache_request->upload($upload) if MP2;
- $c->req->uploads->{ $upload->filename } = {
- fh => $upload->fh,
- size => $upload->size,
- type => $upload->type
- };
- }
-}
+=back
=head1 SEE ALSO
=head1 AUTHOR
Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen C<ch@ngmedia.com>
=head1 COPYRIGHT