X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FCGI.pm;h=30280808d06f992081a64a600296af88459ef89f;hb=bfde09a29c9b25cca920350488ddda743a606031;hp=28400348049f832a5f967edb382b534e98d59f11;hpb=06e1b6164a2c9d7b463f358b0d1934ef83a82845;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 2840034..3028080 100644
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -92,7 +92,7 @@ sub prepare_body {
     # application/x-www-form-urlencoded or multipart/form-data
     # CGI.pm will read STDIN into a param, POSTDATA.
 
-    $c->request->input( $c->cgi->param('POSTDATA') );
+    $c->request->body( $c->cgi->param('POSTDATA') );
 }
 
 =item $c->prepare_connection
@@ -101,8 +101,13 @@ sub prepare_body {
 
 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
@@ -130,22 +135,24 @@ sub prepare_headers {
 
 sub prepare_parameters {
     my $c = shift;
-    
+
     my ( @params );
 
-    for my $param ( $c->cgi->url_param ) { 
-        for my $value (  $c->cgi->url_param($param) ) {
-            push ( @params, $param, $value );
+    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 ) { 
+    for my $param ( $c->cgi->param ) {
         for my $value (  $c->cgi->param($param) ) {
             push ( @params, $param, $value );
         }
     }
- 
-    $c->req->_assign_values( $c->req->parameters, \@params );
+
+    $c->request->param(@params);
 }
 
 =item $c->prepare_path
@@ -157,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} || '/';
@@ -183,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;
 }
 
@@ -197,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] );
@@ -220,12 +227,12 @@ sub prepare_uploads {
                 tempname => $tempname,
                 type     => $type
             );
-            
+
             push( @uploads, $param, $upload );
         }
     }
-    
-    $c->req->_assign_values( $c->req->uploads, \@uploads );
+
+    $c->request->upload(@uploads);
 }
 
 =item $c->run