X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FApache.pm;h=94dacf17c4f775e8ca94bc85ce6ff89a1b521a84;hb=3803e98f718396f93d4ddc246364d342f4debb41;hp=97b3387fd8e26f7dc3dc1c32437d0b010c965db1;hpb=fc7ec1d96ee55d1bf42af3abce155ecb717b9e2b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/Apache.pm b/lib/Catalyst/Engine/Apache.pm
index 97b3387..94dacf1 100644
--- a/lib/Catalyst/Engine/Apache.pm
+++ b/lib/Catalyst/Engine/Apache.pm
@@ -140,7 +140,8 @@ sub prepare_path {
     $base->scheme( $c->apache_request->protocol =~ /HTTPS/ ? 'https' : 'http' );
     $base->host( $c->apache_request->hostname );
     $base->port( $c->apache_request->get_server_port );
-    $base->path( $c->apache_request->location );
+    my $path = $c->apache_request->location;
+    $base->path( $path =~ /\/$/ ? $path : "$path/" );
     $c->req->base( $base->as_string );
 }
 
@@ -162,11 +163,10 @@ 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->name } = {
-            fh       => $upload->fh,
-            filename => $upload->filename,
-            size     => $upload->size,
-            type     => $upload->type
+        $c->req->uploads->{ $upload->filename } = {
+            fh   => $upload->fh,
+            size => $upload->size,
+            type => $upload->type
         };
     }
 }