Added $c-req->protocol and $c->req->secure

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

diff --git a/lib/Catalyst/Engine/Apache/MP19.pm b/lib/Catalyst/Engine/Apache/MP19.pm
index a14718a..02f9a87 100644 (file)
--- a/lib/Catalyst/Engine/Apache/MP19.pm
+++ b/lib/Catalyst/Engine/Apache/MP19.pm
@@ -67,6 +67,15 @@ sub handler : method {
     shift->SUPER::handler(@_);
 }
 
+=item $c->prepare_request($r)
+
+=cut
+
+sub prepare_request {
+    my ( $c, $r ) = @_;
+    $c->apache( Apache::Request->new($r) );
+}
+
 =item $c->prepare_uploads
 
 =cut
@@ -74,8 +83,11 @@ sub handler : method {
 sub prepare_uploads {
     my $c = shift;
 
-    my @uploads;
+    # This is a workaround for a know bug with libapreq <= 2.0.4
+    # http://svn.apache.org/viewcvs.cgi?rev=122925&view=rev
     
+    my @uploads;    
+
     for my $field ( $c->request->param ) {
 
         for my $upload ( $c->apache->upload($field) ) {
@@ -91,16 +103,7 @@ sub prepare_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) );
+    $c->request->upload(@uploads);
 }
 
 =back
@@ -112,6 +115,7 @@ L<Catalyst>, L<Catalyst::Engine>, L<Catalyst::Engine::Apache>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Christian Hansen C<ch@ngmedia.com>
 
 =head1 COPYRIGHT