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

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

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 79ecbb8..9b47011 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -126,7 +126,7 @@ Errors are available via $c->error.
 
 sub execute {
     my ( $c, $class, $code ) = @_;
-    $class = $c->comp($class) || $class;
+    $class = $c->components->{$class} || $class;
     $c->state(0);
     my $callsub = ( caller(1) )[3];
 
@@ -193,6 +193,10 @@ sub finalize {
     return $status;
 }
 
+=item $c->finalize_output
+
+alias to finalize_body
+
 =item $c->finalize_body
 
 Finalize body.
@@ -335,7 +339,7 @@ Finalize headers.
 
 sub finalize_headers { }
 
-=item $c->handler( $class, $r )
+=item $c->handler( $class, $engine )
 
 Handles the request.
 
@@ -360,7 +364,7 @@ sub handler {
             my $elapsed;
             ( $elapsed, $status ) = $class->benchmark($handler);
             $elapsed = sprintf '%f', $elapsed;
-            my $av = sprintf '%.3f', 1 / $elapsed;
+            my $av = sprintf '%.3f', ( $elapsed == 0 ? '??' : (1 / $elapsed) );
             my $t = Text::ASCIITable->new;
             $t->setCols( 'Action', 'Time' );
             $t->setColWidth( 'Action', 64, 1 );
@@ -383,7 +387,7 @@ sub handler {
     return $status;
 }
 
-=item $c->prepare($r)
+=item $c->prepare($engine)
 
 Turns the engine-specific request( Apache, CGI ... )
 into a Catalyst context .
@@ -391,7 +395,7 @@ into a Catalyst context .
 =cut
 
 sub prepare {
-    my ( $class, $r ) = @_;
+    my ( $class, $engine ) = @_;
 
     my $c = bless {
         request => Catalyst::Request->new(
@@ -400,12 +404,18 @@ sub prepare {
                 cookies    => {},
                 headers    => HTTP::Headers->new,
                 parameters => {},
+                secure     => 0,
                 snippets   => [],
                 uploads    => {}
             }
         ),
         response => Catalyst::Response->new(
-            { cookies => {}, headers => HTTP::Headers->new, status => 200 }
+            {
+                body    => undef,
+                cookies => {},
+                headers => HTTP::Headers->new,
+                status => 200
+            }
         ),
         stash => {},
         state => 0
@@ -420,11 +430,11 @@ sub prepare {
         $c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
     }
 
-    $c->prepare_request($r);
-    $c->prepare_path;
+    $c->prepare_request($engine);
+    $c->prepare_connection;
     $c->prepare_headers;
     $c->prepare_cookies;
-    $c->prepare_connection;
+    $c->prepare_path;
     $c->prepare_action;
 
     my $method   = $c->req->method   || '';
@@ -458,8 +468,9 @@ sub prepare {
         $t->setCols( 'Key', 'Value' );
         $t->setColWidth( 'Key',   37, 1 );
         $t->setColWidth( 'Value', 36, 1 );
-        for my $key ( keys %{ $c->req->params } ) {
-            my $value = $c->req->params->{$key} || '';
+        for my $key ( sort keys %{ $c->req->params } ) {
+            my $param = $c->req->params->{$key};
+            my $value = defined($param) ? $param : '';
             $t->addRow( $key, $value );
         }
         $c->log->debug( 'Parameters are', $t->draw );