X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FCGI.pm;h=fbb6c4891f14d05d39692b916b9fe5162eb76d53;hp=e682f6e818a1db2e961c17edd98c490d163ba434;hb=b9e9fff6b976cb138c6d56f10c37ebc20216b74f;hpb=9a33da6aa4eb69de77c36f572e875a2529a39eef diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index e682f6e..fbb6c48 100644 --- a/lib/Catalyst/Engine/CGI.pm +++ b/lib/Catalyst/Engine/CGI.pm @@ -2,13 +2,10 @@ package Catalyst::Engine::CGI; use strict; use base 'Catalyst::Engine'; -use URI; - -require CGI::Simple; -require CGI::Cookie; -$CGI::Simple::POST_MAX = 1048576; -$CGI::Simple::DISABLE_UPLOADS = 0; +use CGI; +use URI; +use URI::http; __PACKAGE__->mk_accessors('cgi'); @@ -18,6 +15,8 @@ Catalyst::Engine::CGI - The CGI Engine =head1 SYNOPSIS +A script using the Catalyst::Engine::CGI module might look like: + #!/usr/bin/perl -w use strict; @@ -26,145 +25,221 @@ Catalyst::Engine::CGI - The CGI Engine MyApp->run; -See L. +The application module (C) would use C, which loads the +appropriate engine module. =head1 DESCRIPTION -This is the CGI engine for Catalyst. +This is the Catalyst engine specialized for the CGI environment (using the +C and C 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: -The script shown above must be designated as a "Non-parsed Headers" -script to function properly. -To do this in Apache name the script starting with C. + use Catalyst qw(-Engine=CGI); The performance of this way of using Catalyst is not expected to be useful in production applications, but it may be helpful for development. -=head2 METHODS +=head1 METHODS + +=over 4 + +=item $c->cgi -=head3 run +This config parameter contains the C object. -To be called from a CGI script to start the Catalyst application. +=back -=head3 cgi +=head1 OVERLOADED METHODS -This config parameter contains the C object. +This class overloads some methods from C. -=head2 OVERLOADED METHODS +=over 4 -This class overloads some methods from C. +=item $c->finalize_body -=head3 finalize_headers +Prints the response output to STDOUT. + +=cut + +sub finalize_body { + my $c = shift; + print $c->response->output; +} + +=item $c->finalize_headers =cut sub finalize_headers { my $c = shift; - my %headers = ( -nph => 1 ); - $headers{-status} = $c->response->status if $c->response->status; - for my $name ( $c->response->headers->header_field_names ) { - $headers{"-$name"} = $c->response->headers->header($name); - } - my @cookies; - while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) { - push @cookies, $c->cgi->cookie( - -name => $name, - -value => $cookie->{value}, - -expires => $cookie->{expires}, - -domain => $cookie->{domain}, - -path => $cookie->{path}, - -secure => $cookie->{secure} || 0 - ); - } - $headers{-cookie} = \@cookies if @cookies; - print $c->cgi->header(%headers); + + $c->response->header( Status => $c->response->status ); + + print $c->response->headers->as_string("\015\012"); + print "\015\012"; } -=head3 finalize_output +=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->body( $c->cgi->param('POSTDATA') ); } -=head3 prepare_cookies +=item $c->prepare_connection =cut -sub prepare_cookies { shift->req->cookies( { CGI::Cookie->fetch } ) } +sub prepare_connection { + my $c = shift; + $c->req->hostname( $ENV{REMOTE_HOST} ); + $c->req->address( $ENV{REMOTE_ADDR} ); +} -=head3 prepare_headers +=item $c->prepare_headers =cut 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->method( $ENV{REQUEST_METHOD} || 'GET' ); } -=head3 prepare_parameters +=item $c->prepare_parameters =cut sub prepare_parameters { - my $c = shift; - 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; + + 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 ); + } + } } - $c->req->parameters( {%vars} ); + + 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 ); } -=head3 prepare_path +=item $c->prepare_path =cut sub prepare_path { my $c = shift; - $c->req->path( $c->cgi->url( -absolute => 1, -path_info => 1 ) ); - my $loc = $c->cgi->url( -absolute => 1 ); - no warnings 'uninitialized'; - $c->req->{path} =~ s/^($loc)?\///; - $c->req->{path} .= '/' if $c->req->path eq $loc; - my $base = $c->cgi->url; - if ( $ENV{CATALYST_TEST} ) { - my $script = $c->cgi->script_name; - $base =~ s/$script$//i; + + my $base; + { + my $scheme = $ENV{HTTPS} ? 'https' : 'http'; + my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME}; + my $port = $ENV{SERVER_PORT} || 80; + my $path = $ENV{SCRIPT_NAME} || '/'; + + $base = URI->new; + $base->scheme($scheme); + $base->host($host); + $base->port($port); + $base->path($path); + + $base = $base->canonical->as_string; } - $base = URI->new($base); - $base->path('/') if ( $ENV{CATALYST_TEST} || !$base->path ); - $c->req->base( $base->as_string ); + + my $path = $ENV{PATH_INFO} || '/'; + $path =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; + $path =~ s/^\///; + + $c->req->base($base); + $c->req->path($path); } -=head3 prepare_request +=item $c->prepare_request =cut -sub prepare_request { shift->cgi( CGI::Simple->new ) } +sub prepare_request { + my ( $c, $cgi ) = @_; + $c->cgi( $cgi || CGI->new ); + $c->cgi->_reset_globals; +} -=head3 prepare_uploads +=item $c->prepare_uploads =cut sub prepare_uploads { my $c = shift; - for my $name ( $c->cgi->upload ) { - $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 + +=cut + sub run { shift->handler } +=back + =head1 SEE ALSO L.