- Improved: Params handling with MP engines

- Fixed: Params handling on POST with CGI engine (Andy Grundman)
- Fixed: Helper.pm on Win32 (Matt S Trout)

diff --git a/lib/Catalyst/Engine/Apache.pm b/lib/Catalyst/Engine/Apache.pm
index 9f52366..a6b763c 100644 (file)
--- a/lib/Catalyst/Engine/Apache.pm
+++ b/lib/Catalyst/Engine/Apache.pm
@@ -93,10 +93,15 @@ sub prepare_headers {
 sub prepare_parameters {
     my $c = shift;
 
-    foreach my $key ( $c->apache->param ) {
-        my @values = $c->apache->param($key);
-        $c->req->parameters->{$key} = ( @values == 1 ) ? $values[0] : \@values;
-    }
+    my @params;
+    
+    $c->apache->param->do( sub {
+        my ( $field, $value ) = @_;
+        push( @params, $field, $value );
+        return 1;    
+    });
+    
+    $c->req->_assign_values( $c->req->parameters, \@params );
 }
 
 =item $c->prepare_path

diff --git a/lib/Catalyst/Engine/Apache/MP19.pm b/lib/Catalyst/Engine/Apache/MP19.pm
index 89761a8..8ced4e8 100644 (file)
--- a/lib/Catalyst/Engine/Apache/MP19.pm
+++ b/lib/Catalyst/Engine/Apache/MP19.pm
@@ -83,8 +83,11 @@ sub prepare_request {
 sub prepare_uploads {
     my $c = shift;
 
-    my @uploads;
+    # This is a workaround for a know bug with libapreq <= 2.0.5
+    # http://svn.apache.org/viewcvs.cgi?rev=122925&view=rev
     
+    my @uploads;    
+
     for my $field ( $c->request->param ) {
 
         for my $upload ( $c->apache->upload($field) ) {

diff --git a/lib/Catalyst/Engine/Apache/MP20.pm b/lib/Catalyst/Engine/Apache/MP20.pm
index 74575e0..cc06abb 100644 (file)
--- a/lib/Catalyst/Engine/Apache/MP20.pm
+++ b/lib/Catalyst/Engine/Apache/MP20.pm
@@ -84,22 +84,22 @@ sub prepare_uploads {
 
     my @uploads;
 
-    for my $field ( $c->apache->upload ) {
+    $c->apache->upload->do( sub {
+        my ( $field, $upload ) = @_;
 
-        for my $upload ( $c->apache->upload($field) ) {
+        my $object = Catalyst::Request::Upload->new(
+            filename => $upload->filename,
+            size     => $upload->size,
+            tempname => $upload->tempname,
+            type     => $upload->type
+        );
 
-            my $object = Catalyst::Request::Upload->new(
-                filename => $upload->filename,
-                size     => $upload->size,
-                tempname => $upload->tempname,
-                type     => $upload->type
-            );
+        push( @uploads, $field, $object );
 
-            push( @uploads, $field, $object );
-        }
-    }
+        return 1;
+    });
 
-    $c->req->_assign_values( $c->req->uploads, \@uploads );
+    $c->request->_assign_values( $c->req->uploads, \@uploads );
 }
 
 =back

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index e80c727..fbb6c48 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -132,10 +132,14 @@ 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->url_param ) {
+            for my $value (  $c->cgi->url_param($param) ) {
+                push ( @params, $param, $value );
+            }
         }
     }
 

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index b341c94..6a78bf3 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -65,7 +65,7 @@ sub mk_app {
     $self->{startperl} = $Config{startperl};
     $self->{scriptgen} = $Catalyst::CATALYST_SCRIPT_GEN;
     $self->{author}    = $self->{author} = $ENV{'AUTHOR'}
-      || @{ [ getpwuid($<) ] }[6];
+      || eval { @{ [ getpwuid($<) ] }[6] } || 'A clever guy';
     $self->_mk_dirs;
     $self->_mk_appclass;
     $self->_mk_build;
@@ -93,7 +93,7 @@ sub mk_component {
     my $app  = shift;
     $self->{app} = $app;
     $self->{author} = $self->{author} = $ENV{'AUTHOR'}
-      || @{ [ getpwuid($<) ] }[6];
+      || eval { @{ [ getpwuid($<) ] }[6] } || 'A clever guy';
     $self->{base} = File::Spec->catdir( $FindBin::Bin, '..' );
     unless ( $_[0] =~ /^model|m|view|v|controller|c\$/i ) {
         my $helper = shift;

diff --git a/t/engine/request/parameters.t b/t/engine/request/parameters.t
index 6cf7da9..cbedc89 100644 (file)
--- a/t/engine/request/parameters.t
+++ b/t/engine/request/parameters.t
@@ -6,7 +6,7 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../lib";
 
-use Test::More tests => 11;
+use Test::More tests => 19;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
@@ -19,6 +19,25 @@ use URI;
 
     my $parameters = { 
         'a' => [qw(A b C d E f G)],
+    };
+    
+    my $query = join( '&', map { 'a=' . $_ } @{ $parameters->{a} } );
+    
+    ok( my $response = request("http://localhost/dump/request?$query"), 'Request' );
+    ok( $response->is_success, 'Response Successful 2xx' );
+    is( $response->content_type, 'text/plain', 'Response Content-Type' );
+    like( $response->content, qr/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' );
+    ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
+    isa_ok( $creq, 'Catalyst::Request' );
+    is( $creq->method, 'GET', 'Catalyst::Request method' );
+    is_deeply( $creq->parameters, $parameters, 'Catalyst::Request parameters' );
+}
+
+{
+    my $creq;
+
+    my $parameters = { 
+        'a' => [qw(A b C d E f G)],
         '%' => [ '%', '"', '& - &' ],
     };