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

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 936a38c..2840034 100644
--- 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->input( $c->cgi->param('POSTDATA') );
 }
 
 =item $c->prepare_connection
@@ -116,11 +130,22 @@ sub prepare_headers {
 
 sub prepare_parameters {
     my $c = shift;
+    
+    my ( @params );
 
-    for my $param ( $c->cgi->param ) {
-        my @values = $c->cgi->param($param);
-        $c->req->parameters->{$param} = ( @values > 1 ) ? \@values : $values[0];
+    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 $value (  $c->cgi->param($param) ) {
+            push ( @params, $param, $value );
+        }
     }
+ 
+    $c->req->_assign_values( $c->req->parameters, \@params );
 }
 
 =item $c->prepare_path