X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FResponse.pm;h=fa3b1462c00eb45502fc027fc2f600123acfec4e;hp=8c26ae446691b1898b3dc1f218b3d1f4684bdf6d;hb=8a3dcb987d47c13e0665cb975658df8c88442d7e;hpb=0fb9468872e905cacecbff82b31170f7c7b1a081 diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm index 8c26ae4..fa3b146 100644 --- a/lib/Catalyst/Response.pm +++ b/lib/Catalyst/Response.pm @@ -111,23 +111,15 @@ sub from_psgi_response { my ($status, $headers, $body) = @$psgi_res; $self->status($status); $self->headers(HTTP::Headers->new(@$headers)); - if(ref $body eq 'ARRAY') { - $self->body(join '', grep defined, @$body); - } else { - $self->body($body); - } + $self->body($body); } elsif(ref $psgi_res eq 'CODE') { $psgi_res->(sub { my $response = shift; my ($status, $headers, $maybe_body) = @$response; $self->status($status); $self->headers(HTTP::Headers->new(@$headers)); - if($maybe_body) { - if(ref $maybe_body eq 'ARRAY') { - $self->body(join '', grep defined, @$maybe_body); - } else { - $self->body($maybe_body); - } + if(defined $maybe_body) { + $self->body($maybe_body); } else { return $self->write_fh; }