package Catalyst::Engine::CGI;
-use strict;
-use base 'Catalyst::Engine';
-use NEXT;
-use URI;
+use Moose;
+extends 'Catalyst::Engine';
+
+has env => (is => 'rw');
=head1 NAME
This class overloads some methods from C<Catalyst::Engine>.
-=over 4
-
-=item $self->finalize_headers($c)
+=head2 $self->finalize_headers($c)
=cut
$c->response->header( Status => $c->response->status );
- print $c->response->headers->as_string("\015\012");
- print "\015\012";
+ $self->{_header_buf}
+ = $c->response->headers->as_string("\015\012") . "\015\012";
}
-=item $self->prepare_connection($c)
+=head2 $self->prepare_connection($c)
=cut
sub prepare_connection {
my ( $self, $c ) = @_;
+ local (*ENV) = $self->env || \%ENV;
- $c->request->address( $ENV{REMOTE_ADDR} );
+ my $request = $c->request;
+ $request->address( $ENV{REMOTE_ADDR} );
PROXY_CHECK:
{
# If we are running as a backend server, the user will always appear
# as 127.0.0.1. Select the most recent upstream IP (last in the list)
my ($ip) = $ENV{HTTP_X_FORWARDED_FOR} =~ /([^,\s]+)$/;
- $c->request->address($ip);
+ $request->address($ip);
}
- $c->request->hostname( $ENV{REMOTE_HOST} );
- $c->request->protocol( $ENV{SERVER_PROTOCOL} );
- $c->request->user( $ENV{REMOTE_USER} );
- $c->request->method( $ENV{REQUEST_METHOD} );
+ $request->hostname( $ENV{REMOTE_HOST} );
+ $request->protocol( $ENV{SERVER_PROTOCOL} );
+ $request->user( $ENV{REMOTE_USER} );
+ $request->method( $ENV{REQUEST_METHOD} );
if ( $ENV{HTTPS} && uc( $ENV{HTTPS} ) eq 'ON' ) {
- $c->request->secure(1);
+ $request->secure(1);
}
if ( $ENV{SERVER_PORT} == 443 ) {
- $c->request->secure(1);
+ $request->secure(1);
}
}
-=item $self->prepare_headers($c)
+=head2 $self->prepare_headers($c)
=cut
sub prepare_headers {
my ( $self, $c ) = @_;
-
+ local (*ENV) = $self->env || \%ENV;
+ my $headers = $c->request->headers;
# Read headers from %ENV
- while ( my ( $header, $value ) = each %ENV ) {
+ foreach my $header ( keys %ENV ) {
next unless $header =~ /^(?:HTTP|CONTENT|COOKIE)/i;
( my $field = $header ) =~ s/^HTTPS?_//;
- $c->req->headers->header( $field => $value );
+ $headers->header( $field => $ENV{$header} );
}
}
-=item $self->prepare_path($c)
+=head2 $self->prepare_path($c)
=cut
sub prepare_path {
my ( $self, $c ) = @_;
+ local (*ENV) = $self->env || \%ENV;
my $scheme = $c->request->secure ? 'https' : 'http';
my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME};
my $port = $ENV{SERVER_PORT} || 80;
- my $base_path = $ENV{SCRIPT_NAME} || '/';
+ my $base_path;
+ if ( exists $ENV{REDIRECT_URL} ) {
+ $base_path = $ENV{REDIRECT_URL};
+ $base_path =~ s/$ENV{PATH_INFO}$//;
+ }
+ else {
+ $base_path = $ENV{SCRIPT_NAME} || '/';
+ }
# If we are running as a backend proxy, get the true hostname
PROXY_CHECK:
$port = $c->request->secure ? 443 : 80;
}
- my $path = $base_path . $ENV{PATH_INFO};
+ # set the request URI
+ my $path = $base_path . ( $ENV{PATH_INFO} || '' );
$path =~ s{^/+}{};
+
+ # Using URI directly is way too slow, so we construct the URLs manually
+ my $uri_class = "URI::$scheme";
+
+ # HTTP_HOST will include the port even if it's 80/443
+ $host =~ s/:(?:80|443)$//;
+
+ if ( $port !~ /^(?:80|443)$/ && $host !~ /:/ ) {
+ $host .= ":$port";
+ }
+
+ # Escape the path
+ $path =~ s/([^$URI::uric])/$URI::Escape::escapes{$1}/go;
+ $path =~ s/\?/%3F/g; # STUPID STUPID SPECIAL CASE
+
+ my $query = $ENV{QUERY_STRING} ? '?' . $ENV{QUERY_STRING} : '';
+ my $uri = $scheme . '://' . $host . '/' . $path . $query;
- my $uri = URI->new;
- $uri->scheme($scheme);
- $uri->host($host);
- $uri->port($port);
- $uri->path($path);
- $uri->query( $ENV{QUERY_STRING} ) if $ENV{QUERY_STRING};
-
- # sanitize the URI
- $uri = $uri->canonical;
- $c->request->uri($uri);
+ $c->request->uri( bless \$uri, $uri_class );
# set the base URI
# base must end in a slash
- $base_path .= '/' unless ( $base_path =~ /\/$/ );
- my $base = $uri->clone;
- $base->path_query($base_path);
- $c->request->base($base);
+ $base_path .= '/' unless $base_path =~ m{/$};
+
+ my $base_uri = $scheme . '://' . $host . $base_path;
+
+ $c->request->base( bless \$base_uri, $uri_class );
}
-=item $self->prepare_query_parameters($c)
+=head2 $self->prepare_query_parameters($c)
=cut
-sub prepare_query_parameters {
+around prepare_query_parameters => sub {
+ my $orig = shift;
my ( $self, $c ) = @_;
-
- $self->SUPER::prepare_query_parameters( $c, $ENV{QUERY_STRING} );
+ local (*ENV) = $self->env || \%ENV;
+
+ if ( $ENV{QUERY_STRING} ) {
+ $self->$orig( $c, $ENV{QUERY_STRING} );
+ }
+};
+
+=head2 $self->prepare_request($c, (env => \%env))
+
+=cut
+
+sub prepare_request {
+ my ( $self, $c, %args ) = @_;
+
+ if ( $args{env} ) {
+ $self->env( $args{env} );
+ }
}
-=item $self->prepare_write($c)
+=head2 $self->prepare_write($c)
Enable autoflush on the output handle for CGI-based engines.
=cut
-sub prepare_write {
- my ( $self, $c ) = @_;
-
- # Set the output handle to autoflush
+before prepare_write => sub {
*STDOUT->autoflush(1);
+};
- $self->NEXT::prepare_write($c);
-}
+=head2 $self->write($c, $buffer)
-=item $self->read_chunk($c, $buffer, $length)
+Writes the buffer to the client.
+
+=cut
+
+around write => sub {
+ my $orig = shift;
+ my ( $self, $c, $buffer ) = @_;
+
+ # Prepend the headers if they have not yet been sent
+ if ( my $headers = delete $self->{_header_buf} ) {
+ $buffer = $headers . $buffer;
+ }
+
+ return $self->$orig( $c, $buffer );
+};
+
+=head2 $self->read_chunk($c, $buffer, $length)
=cut
sub read_chunk { shift; shift; *STDIN->sysread(@_); }
-=item $self->run
+=head2 $self->run
=cut
sub run { shift; shift->handle_request(@_) }
-=back
-
=head1 SEE ALSO
L<Catalyst> L<Catalyst::Engine>.
projects / catagits/Catalyst-Runtime.git / blobdiff