use strict;
use base 'Catalyst::Engine';
-use URI;
-
-require CGI::Simple;
-$CGI::Simple::POST_MAX = 1048576;
-$CGI::Simple::DISABLE_UPLOADS = 0;
+use CGI;
+use URI;
+use URI::http;
__PACKAGE__->mk_accessors('cgi');
=head1 DESCRIPTION
This is the Catalyst engine specialized for the CGI environment (using the
-C<CGI::Simple> and C<CGI::Cookie> modules). Normally Catalyst will select the
+C<CGI> and C<CGI::Cookie> modules). Normally Catalyst will select the
appropriate engine according to the environment that it detects, however you
can force Catalyst to use the CGI engine by specifying the following in your
application module:
=item $c->cgi
-This config parameter contains the C<CGI::Simple> object.
+This config parameter contains the C<CGI> object.
=back
sub finalize_headers {
my $c = shift;
- my %headers;
-
- $headers{-status} = $c->response->status if $c->response->status;
- for my $name ( $c->response->headers->header_field_names ) {
- $headers{"-$name"} = $c->response->header($name);
- }
+ $c->response->header( Status => $c->response->status );
- print $c->cgi->header(%headers);
+ print $c->response->headers->as_string("\015\012");
+ print "\015\012";
}
=item $c->finalize_output
sub prepare_connection {
my $c = shift;
- $c->req->hostname( $c->cgi->remote_host );
- $c->req->address( $c->cgi->remote_addr );
+ $c->req->hostname( $ENV{REMOTE_HOST} );
+ $c->req->address( $ENV{REMOTE_ADDR} );
}
=item $c->prepare_headers
sub prepare_headers {
my $c = shift;
- $c->req->method( $c->cgi->request_method );
- for my $header ( $c->cgi->http ) {
+
+ while ( my ( $header, $value ) = each %ENV ) {
+
+ next unless $header =~ /^(HTTP|CONTENT)/i;
+
( my $field = $header ) =~ s/^HTTPS?_//;
- $c->req->headers->header( $field => $c->cgi->http($header) );
+
+ $c->req->headers->header( $field => $value );
}
- $c->req->headers->header( 'Content-Type' => $c->cgi->content_type );
- $c->req->headers->header( 'Content-Length' => $c->cgi->content_length );
+
+ $c->req->method( $ENV{REQUEST_METHOD} || 'GET' );
}
=item $c->prepare_parameters
=cut
sub prepare_parameters {
- my $c = shift;
-
- $c->cgi->parse_query_string;
-
- my %vars = $c->cgi->Vars;
- while ( my ( $key, $value ) = each %vars ) {
- my @values = split "\0", $value;
- $vars{$key} = @values <= 1 ? $values[0] : \@values;
+ my $c = shift;
+
+ for my $param ( $c->cgi->param ) {
+ my @values = $c->cgi->param($param);
+ $c->req->parameters->{$param} = ( @values > 1 ) ? \@values : $values[0];
}
- $c->req->parameters( {%vars} );
}
=item $c->prepare_path
my $base;
{
my $scheme = $ENV{HTTPS} ? 'https' : 'http';
- my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME};
+ my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME};
my $port = $ENV{SERVER_PORT} || 80;
my $path = $ENV{SCRIPT_NAME} || '/';
my $path = $ENV{PATH_INFO} || '/';
$path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
- $path =~ s/^\///;
+ $path =~ s/^\///;
$c->req->base($base);
$c->req->path($path);
=cut
-sub prepare_request { shift->cgi( CGI::Simple->new ) }
+sub prepare_request {
+ my $c = shift;
+ $c->cgi( CGI->new );
+ $c->cgi->_reset_globals;
+}
=item $c->prepare_uploads
sub prepare_uploads {
my $c = shift;
- for my $name ( $c->cgi->upload ) {
- next unless defined $name;
- $c->req->uploads->{$name} = {
- fh => $c->cgi->upload($name),
- size => $c->cgi->upload_info( $name, 'size' ),
- type => $c->cgi->upload_info( $name, 'mime' )
- };
+
+ my @uploads;
+
+ for my $param ( $c->cgi->param ) {
+
+ my @values = $c->cgi->param($param);
+
+ next unless ref( $values[0] );
+
+ for my $fh (@values) {
+
+ next unless my $size = ( stat $fh )[7];
+
+ my $info = $c->cgi->uploadInfo($fh);
+ my $tempname = $c->cgi->tmpFileName($fh);
+ my $type = $info->{'Content-Type'};
+ my $disposition = $info->{'Content-Disposition'};
+ my $filename = ( $disposition =~ / filename="([^;]*)"/ )[0];
+
+ my $upload = Catalyst::Request::Upload->new(
+ filename => $filename,
+ size => $size,
+ tempname => $tempname,
+ type => $type
+ );
+
+ push( @uploads, $param, $upload );
+ }
}
+
+ $c->req->_assign_values( $c->req->uploads, \@uploads );
}
=item $c->run