use HTTP::Response;
use IO::Handle;
use IO::File;
+use URI ();
+use URI::Escape ();
-__PACKAGE__->mk_accessors(qw[ enviroment request stdin stdout stderr ]);
+__PACKAGE__->mk_accessors(qw[ environment request stdin stdout stderr ]);
+
+# old typo
+
+=begin Pod::Coverage
+
+ enviroment
+
+=end Pod::Coverage
+
+=cut
+
+*enviroment = \&environment;
+
+my %reserved = map { sprintf('%02x', ord($_)) => 1 } split //, $URI::reserved;
+sub _uri_safe_unescape {
+ my ($s) = @_;
+ $s =~ s/%([a-fA-F0-9]{2})/$reserved{lc($1)} ? "%$1" : pack('C', hex($1))/ge;
+ $s
+}
sub new {
my $class = shift;
$uri->port(80) unless $uri->port;
$uri->host_port($host) unless !$host || ( $host eq $uri->host_port );
+ # Get it before canonicalized so REQUEST_URI can be as raw as possible
+ my $request_uri = $uri->path_query;
+
$uri = $uri->canonical;
- my $enviroment = {
+ my $environment = {
GATEWAY_INTERFACE => 'CGI/1.1',
HTTP_HOST => $uri->host_port,
HTTPS => ( $uri->scheme eq 'https' ) ? 'ON' : 'OFF', # not in RFC 3875
SERVER_NAME => $uri->host,
SERVER_PORT => $uri->port,
SERVER_PROTOCOL => $request->protocol || 'HTTP/1.1',
- SERVER_SOFTWARE => "HTTP-Request-AsCGI/$VERSION",
+ SERVER_SOFTWARE => 'HTTP-Request-AsCGI/' . our $VERSION,
REMOTE_ADDR => '127.0.0.1',
REMOTE_HOST => 'localhost',
REMOTE_PORT => int( rand(64000) + 1000 ), # not in RFC 3875
- REQUEST_URI => $uri->path_query, # not in RFC 3875
+ REQUEST_URI => $request_uri, # not in RFC 3875
REQUEST_METHOD => $request->method,
@_
};
+ # RFC 3875 says PATH_INFO is not URI-encoded. That's really
+ # annoying for applications that you can't tell "%2F" vs "/", but
+ # doing the partial decoding then makes it impossible to tell
+ # "%252F" vs "%2F". Encoding everything is more compatible to what
+ # web servers like Apache or lighttpd do, anyways.
+ $environment->{PATH_INFO} = URI::Escape::uri_unescape($environment->{PATH_INFO});
+
foreach my $field ( $request->headers->header_field_names ) {
my $key = uc("HTTP_$field");
$key =~ tr/-/_/;
$key =~ s/^HTTP_// if $field =~ /^Content-(Length|Type)$/;
- unless ( exists $enviroment->{$key} ) {
- $enviroment->{$key} = $request->headers->header($field);
+ unless ( exists $environment->{$key} ) {
+ $environment->{$key} = $request->headers->header($field);
}
}
- unless ( $enviroment->{SCRIPT_NAME} eq '/' && $enviroment->{PATH_INFO} ) {
- $enviroment->{PATH_INFO} =~ s/^\Q$enviroment->{SCRIPT_NAME}\E/\//;
- $enviroment->{PATH_INFO} =~ s/^\/+/\//;
+ unless ( $environment->{SCRIPT_NAME} eq '/' && $environment->{PATH_INFO} ) {
+ $environment->{PATH_INFO} =~ s/^\Q$environment->{SCRIPT_NAME}\E/\//;
+ $environment->{PATH_INFO} =~ s/^\/+/\//;
}
- $self->enviroment($enviroment);
+ $self->environment($environment);
return $self;
}
sub setup {
my $self = shift;
- $self->{restore}->{enviroment} = {%ENV};
+ $self->{restore}->{environment} = {%ENV};
binmode( $self->stdin );
{
no warnings 'uninitialized';
- %ENV = %{ $self->enviroment };
+ %ENV = (%ENV, %{ $self->environment });
}
if ( $INC{'CGI.pm'} ) {
$headers .= $line;
last if $headers =~ /\x0d?\x0a\x0d?\x0a$/;
}
-
+
unless ( defined $headers ) {
$headers = "HTTP/1.1 500 Internal Server Error\x0d\x0a";
}
$response->code($code);
$response->message($message);
}
-
+
my $length = ( stat( $self->stdout ) )[7] - tell( $self->stdout );
if ( $response->code == 500 && !$length ) {
{
no warnings 'uninitialized';
- %ENV = %{ $self->{restore}->{enviroment} };
+ %ENV = %{ $self->{restore}->{environment} };
}
open( STDIN, '<&'. fileno($self->{restore}->{stdin}) )
use CGI;
use HTTP::Request;
use HTTP::Request::AsCGI;
-
+
my $request = HTTP::Request->new( GET => 'http://www.host.com/' );
my $stdout;
-
+
{
my $c = HTTP::Request::AsCGI->new($request)->setup;
my $q = CGI->new;
-
+
print $q->header,
$q->start_html('Hello World'),
$q->h1('Hello World'),
$q->end_html;
-
+
$stdout = $c->stdout;
-
- # enviroment and descriptors will automatically be restored
+
+ # environment and descriptors will automatically be restored
# when $c is destructed.
}
-
+
while ( my $line = $stdout->getline ) {
print $line;
}
-
+
=head1 DESCRIPTION
-Provides a convinient way of setting up an CGI enviroment from a HTTP::Request.
+Provides a convenient way of setting up an CGI environment from an HTTP::Request.
=head1 METHODS
-=over 4
+=over 4
=item new ( $request [, key => value ] )
-Constructor, first argument must be a instance of HTTP::Request
-followed by optional pairs of environment key and value.
+Constructor. The first argument must be a instance of HTTP::Request, followed
+by optional pairs of environment key and value.
-=item enviroment
+=item environment
-Returns a hashref containing the environment that will be used in setup.
+Returns a hashref containing the environment that will be used in setup.
Changing the hashref after setup has been called will have no effect.
=item setup
-Setups the environment and descriptors.
+Sets up the environment and descriptors.
=item restore
-Restores the enviroment and descriptors. Can only be called after setup.
+Restores the environment and descriptors. Can only be called after setup.
=item request
projects / catagits/HTTP-Request-AsCGI.git / blobdiff