use HTTP::Headers::Util 'split_header_words';
use HTTP::Request;
use HTTP::Response;
-use IO::File;
+use File::Temp;
use URI;
__PACKAGE__->mk_accessors(qw/http/);
=over 4
+=item $c->finalize_body
+
+=cut
+
+sub finalize_body {
+ my $c = shift;
+ $c->http->response->content( $c->response->body );
+}
+
=item $c->finalize_headers
=cut
}
}
-=item $c->finalize_output
+=item $c->prepare_body
=cut
-sub finalize_output {
+sub prepare_body {
my $c = shift;
- $c->http->response->content( $c->response->output );
+ $c->request->body( $c->http->request->content );
}
=item $c->prepare_connection
sub prepare_parameters {
my $c = shift;
- my @params = ();
+ my ( @params, @uploads );
+
my $request = $c->http->request;
push( @params, $request->uri->query_form );
if ( $parameters{filename} ) {
- my $fh = IO::File->new_tmpfile;
+ my $fh = File::Temp->new( UNLINK => 0 );
$fh->write( $part->content ) or die $!;
- $fh->seek( SEEK_SET, 0 ) or die $!;
+ $fh->flush or die $!;
- $c->req->uploads->{ $parameters{filename} } = {
- fh => $fh,
- size => ( stat $fh )[7],
- type => $part->content_type
- };
+ my $upload = Catalyst::Request::Upload->new(
+ filename => $parameters{filename},
+ size => ( $fh->stat )[7],
+ tempname => $fh->filename,
+ type => $part->content_type
+ );
- push( @params, $parameters{filename}, $fh );
+ $fh->close;
+
+ push( @uploads, $parameters{name}, $upload );
+ push( @params, $parameters{name}, $parameters{filename} );
}
else {
push( @params, $parameters{name}, $part->content );
}
}
- my $parameters = $c->req->parameters;
-
- while ( my ( $name, $value ) = splice( @params, 0, 2 ) ) {
-
- if ( exists $parameters->{$name} ) {
- for ( $parameters->{$name} ) {
- $_ = [$_] unless ref($_) eq "ARRAY";
- push( @$_, $value );
- }
- }
- else {
- $parameters->{$name} = $value;
- }
- }
+ $c->req->_assign_values( $c->req->parameters, \@params );
+ $c->req->_assign_values( $c->req->uploads, \@uploads );
}
=item $c->prepare_path
unless ( ref $request ) {
- my $uri = ( $request =~ m/http/i )
+ my $uri =
+ ( $request =~ m/http/i )
? URI->new($request)
: URI->new( 'http://localhost' . $request );