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

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

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index af26d08..3028080 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -57,6 +57,17 @@ This class overloads some methods from C<Catalyst::Engine>.
 
 =over 4
 
+=item $c->finalize_body
+
+Prints the response output to STDOUT.
+
+=cut
+
+sub finalize_body {
+    my $c = shift;
+    print $c->response->output;
+}
+
 =item $c->finalize_headers
 
 =cut
@@ -70,15 +81,18 @@ sub finalize_headers {
     print "\015\012";
 }
 
-=item $c->finalize_output
-
-Prints the response output to STDOUT.
+=item $c->prepare_body
 
 =cut
 
-sub finalize_output {
+sub prepare_body {
     my $c = shift;
-    print $c->response->output;
+
+    # XXX this is undocumented in CGI.pm. If Content-Type is not
+    # application/x-www-form-urlencoded or multipart/form-data
+    # CGI.pm will read STDIN into a param, POSTDATA.
+
+    $c->request->body( $c->cgi->param('POSTDATA') );
 }
 
 =item $c->prepare_connection
@@ -87,8 +101,13 @@ sub finalize_output {
 
 sub prepare_connection {
     my $c = shift;
-    $c->req->hostname( $ENV{REMOTE_HOST} );
-    $c->req->address( $ENV{REMOTE_ADDR} );
+    $c->request->address( $ENV{REMOTE_ADDR} );
+    $c->request->hostname( $ENV{REMOTE_HOST} );
+    $c->request->protocol( $ENV{SERVER_PROTOCOL} );
+
+    if ( $ENV{HTTPS} || $ENV{SERVER_PORT} == 443 ) {
+        $c->request->secure(1);
+    }
 }
 
 =item $c->prepare_headers
@@ -117,10 +136,23 @@ sub prepare_headers {
 sub prepare_parameters {
     my $c = shift;
 
+    my ( @params );
+
+    if ( $c->request->method eq 'POST' ) {
+        for my $param ( $c->cgi->url_param ) {
+            for my $value (  $c->cgi->url_param($param) ) {
+                push ( @params, $param, $value );
+            }
+        }
+    }
+
     for my $param ( $c->cgi->param ) {
-        my @values = $c->cgi->param($param);
-        $c->req->parameters->{$param} = ( @values > 1 ) ? \@values : $values[0];
+        for my $value (  $c->cgi->param($param) ) {
+            push ( @params, $param, $value );
+        }
     }
+
+    $c->request->param(@params);
 }
 
 =item $c->prepare_path
@@ -132,7 +164,7 @@ sub prepare_path {
 
     my $base;
     {
-        my $scheme = $ENV{HTTPS} ? 'https' : 'http';
+        my $scheme = $c->request->secure ? 'https' : 'http';
         my $host   = $ENV{HTTP_HOST}   || $ENV{SERVER_NAME};
         my $port   = $ENV{SERVER_PORT} || 80;
         my $path   = $ENV{SCRIPT_NAME} || '/';
@@ -158,9 +190,9 @@ sub prepare_path {
 
 =cut
 
-sub prepare_request { 
-    my $c = shift;
-    $c->cgi( CGI->new );
+sub prepare_request {
+    my ( $c, $cgi ) = @_;
+    $c->cgi( $cgi || CGI->new );
     $c->cgi->_reset_globals;
 }
 
@@ -172,9 +204,9 @@ sub prepare_uploads {
     my $c = shift;
 
     my @uploads;
-    
+
     for my $param ( $c->cgi->param ) {
-    
+
         my @values = $c->cgi->param($param);
 
         next unless ref( $values[0] );
@@ -189,19 +221,18 @@ sub prepare_uploads {
             my $disposition = $info->{'Content-Disposition'};
             my $filename    = ( $disposition =~ / filename="([^;]*)"/ )[0];
 
-            my $upload = {
-                fh       => $fh,
+            my $upload = Catalyst::Request::Upload->new(
                 filename => $filename,
                 size     => $size,
                 tempname => $tempname,
                 type     => $type
-            };
-            
+            );
+
             push( @uploads, $param, $upload );
         }
     }
-    
-    $c->req->_assign_values( $c->req->uploads, \@uploads );
+
+    $c->request->upload(@uploads);
 }
 
 =item $c->run