Updated Changes for Cat5

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine / Apache / MP1.pm

diff --git a/lib/Catalyst/Engine/Apache/MP1.pm b/lib/Catalyst/Engine/Apache/MP1.pm
index 842a4de..6966e9e 100644 (file)
--- a/lib/Catalyst/Engine/Apache/MP1.pm
+++ b/lib/Catalyst/Engine/Apache/MP1.pm
@@ -3,12 +3,12 @@ package Catalyst::Engine::Apache::MP1;
 use strict;
 use base 'Catalyst::Engine::Apache';
 
-use Apache ();
-use Apache::Constants qw(:common);
-use Apache::Request ();
-use Apache::Cookie ();
+use Apache            ();
+use Apache::Constants ();
+use Apache::Request   ();
+use Apache::Cookie    ();
 
-sub handler ($$) { shift->SUPER::handler(@_) }
+Apache::Constants->import(':common');
 
 =head1 NAME
 
@@ -28,8 +28,64 @@ This class overloads some methods from C<Catalyst::Engine::Apache>.
 
 =over 4
 
+=item $c->finalize_headers
+
+=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;
+}
+
 =item $c->handler
 
+=cut
+
+sub handler ($$) {
+    shift->SUPER::handler(@_);
+}
+
+=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->req->_assign_values( $c->req->uploads, \@uploads );
+}
+
 =back
 
 =head1 SEE ALSO