X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FApache%2FMP13.pm;h=27066c3f209ae80bc14d02702822983e6e8f7a47;hb=316bf0f004c0de103e628994a4384e6cf4b45377;hp=8b37fa0897200d507e8bbb301aebd20ad0a83b1b;hpb=c2e8e6fa308480a083f88f9fd82f835aae150c34;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/Apache/MP13.pm b/lib/Catalyst/Engine/Apache/MP13.pm
index 8b37fa0..27066c3 100644
--- a/lib/Catalyst/Engine/Apache/MP13.pm
+++ b/lib/Catalyst/Engine/Apache/MP13.pm
@@ -1,14 +1,7 @@
 package Catalyst::Engine::Apache::MP13;
 
 use strict;
-use base 'Catalyst::Engine::Apache::Base';
-
-use Apache            ();
-use Apache::Constants ();
-use Apache::Request   ();
-use Apache::Cookie    ();
-
-Apache::Constants->import(':common');
+use base qw[Catalyst::Engine::Apache::MP13::Base Catalyst::Engine::CGI];
 
 =head1 NAME
 
@@ -24,75 +17,49 @@ This is the Catalyst engine specialized for Apache mod_perl version 1.3x.
 
 =head1 OVERLOADED METHODS
 
-This class overloads some methods from C<Catalyst::Engine::Apache::Base>.
+This class overloads some methods from C<Catalyst::Engine::Apache::MP13::Base>
+and C<Catalyst::Engine::CGI>.
 
 =over 4
 
-=item $c->finalize_headers
+=item $c->prepare_body
 
 =cut
 
-sub finalize_headers {
-    my $c = shift;
-
-    for my $name ( $c->response->headers->header_field_names ) {
-        next if $name =~ /Content-Type/i;
-        my @values = $c->response->header($name);
-        $c->apache->headers_out->add( $name => $_ ) for @values;
-    }
-
-    if ( $c->response->header('Set-Cookie') && $c->response->status >= 300 ) {
-        my @values = $c->response->header('Set-Cookie');
-        $c->apache->err_headers_out->add( 'Set-Cookie' => $_ ) for @values;
-    }
-
-    $c->apache->status( $c->response->status );
-    $c->apache->content_type( $c->response->header('Content-Type') );
-
-    $c->apache->send_http_header;
-
-    return 0;
+sub prepare_body { 
+    shift->Catalyst::Engine::CGI::prepare_body(@_);
 }
 
-=item $c->handler
+=item $c->prepare_parameters
 
 =cut
 
-sub handler ($$) {
-    shift->SUPER::handler(@_);
+sub prepare_parameters { 
+    shift->Catalyst::Engine::CGI::prepare_parameters(@_);
 }
 
-=item $c->prepare_request($r)
+=item $c->prepare_request
 
 =cut
 
 sub prepare_request {
-    my ( $c, $r ) = @_;
-    $c->apache( Apache::Request->new($r) );
+    my ( $c, $r, @arguments ) = @_;
+    
+    $ENV{CONTENT_TYPE}   = $r->header_in("Content-Type");
+    $ENV{CONTENT_LENGTH} = $r->header_in("Content-Length");
+    $ENV{QUERY_STRING}   = $r->args;
+    $ENV{REQUEST_METHOD} = $r->method;
+
+    $c->SUPER::prepare_request($r);
+    $c->Catalyst::Engine::CGI::prepare_request( $r, @arguments );
 }
 
 =item $c->prepare_uploads
 
 =cut
 
-sub prepare_uploads {
-    my $c = shift;
-
-    my @uploads;
-
-    for my $upload ( $c->apache->upload ) {
-
-        my $object = Catalyst::Request::Upload->new(
-            filename => $upload->filename,
-            size     => $upload->size,
-            tempname => $upload->tempname,
-            type     => $upload->type
-        );
-
-        push( @uploads, $upload->name, $object );
-    }
-
-    $c->request->upload(@uploads);
+sub prepare_uploads { 
+    shift->Catalyst::Engine::CGI::prepare_uploads(@_);
 }
 
 =back