Canonicalize the url becuse we're building it from the always-undecoded REQUEST_URI...

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

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 4cc8c6d..c8e9c7c 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -537,7 +537,7 @@ sub prepare_path {
     my $query = $env->{QUERY_STRING} ? '?' . $env->{QUERY_STRING} : '';
     my $uri   = $scheme . '://' . $host . '/' . $path . $query;
 
-    $ctx->request->uri( bless \$uri, $uri_class );
+    $ctx->request->uri( (bless \$uri, $uri_class)->canonical );
 
     # set the base URI
     # base must end in a slash
@@ -751,7 +751,6 @@ Start the engine. Implemented by the various engine classes.
 
 sub run {
     my ($self, $app, @args) = @_;
-    Carp::cluck("Run");
     # FIXME - Do something sensible with the options we're passed
     $self->_run_psgi_app($self->_build_psgi_app($app, @args), @args);
 }
@@ -783,9 +782,9 @@ sub _build_psgi_app {
 }
 
 sub _run_psgi_app {
-    my ($self, $psgi_app, @args);
+    my ($self, $psgi_app, @args) = @_;
     # FIXME - Need to be able to specify engine and pass options..
-    Plack::Loader->auto()->run($psgi_app);
+    Plack::Loader->auto(port => $args[0])->run($psgi_app);
 }
 
 =head2 $self->write($c, $buffer)