use base 'Class::Accessor::Fast';
use Carp;
+use HTTP::Response;
use IO::Handle;
use IO::File;
-__PACKAGE__->mk_accessors(
- qw[ enviroment request rawhandles stdin stdout stderr ]);
+__PACKAGE__->mk_accessors(qw[ enviroment request stdin stdout stderr ]);
-our $VERSION = 0.4;
+our $VERSION = 0.5;
sub new {
my $class = shift;
my $self = $class->SUPER::new( { restored => 0, setuped => 0 } );
$self->request($request);
+ $self->stdin( IO::File->new_tmpfile );
+ $self->stdout( IO::File->new_tmpfile );
my $host = $request->header('Host');
my $uri = $request->uri->clone;
$uri->scheme('http') unless $uri->scheme;
$uri->host('localhost') unless $uri->host;
$uri->port(80) unless $uri->port;
- $uri->host_port($host) unless !$host || ( $host eq $uri->host_port );
+ $uri->host_port($host) unless !$host || ( $host eq $uri->host_port );
$uri = $uri->canonical;
my $enviroment = {
GATEWAY_INTERFACE => 'CGI/1.1',
HTTP_HOST => $uri->host_port,
- HTTPS => ( $uri->scheme eq 'https' ) ? 'ON' : 'OFF', # not in RFC 3875
- PATH_INFO => $uri->path,
- QUERY_STRING => $uri->query || '',
- SCRIPT_NAME => '/',
- SERVER_NAME => $uri->host,
- SERVER_PORT => $uri->port,
- SERVER_PROTOCOL => $request->protocol || 'HTTP/1.1',
- SERVER_SOFTWARE => "HTTP-Request-AsCGI/$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_METHOD => $request->method,
+ HTTPS => ( $uri->scheme eq 'https' ) ? 'ON' : 'OFF', # not in RFC 3875
+ PATH_INFO => $uri->path,
+ QUERY_STRING => $uri->query || '',
+ SCRIPT_NAME => '/',
+ SERVER_NAME => $uri->host,
+ SERVER_PORT => $uri->port,
+ SERVER_PROTOCOL => $request->protocol || 'HTTP/1.1',
+ SERVER_SOFTWARE => "HTTP-Request-AsCGI/$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_METHOD => $request->method,
@_
};
$self->{restore}->{enviroment} = {%ENV};
- if ( $self->rawhandles ) {
- $self->stdin( \*STDIN );
- $self->stdout( \*STDOUT );
- }
- else {
- $self->stdin( IO::File->new_tmpfile );
- $self->stdout( IO::File->new_tmpfile );
- }
-
binmode( $self->stdin );
if ( $self->request->content_length ) {
or croak("Can't seek stdin handle: $!");
}
- unless ( $self->rawhandles ) {
-
- open( $self->{restore}->{stdin}, '>&', STDIN->fileno )
- or croak("Can't dup stdin: $!");
+ open( $self->{restore}->{stdin}, '<&', STDIN->fileno )
+ or croak("Can't dup stdin: $!");
- open( STDIN, '<&=', $self->stdin->fileno )
- or croak("Can't open stdin: $!");
+ open( STDIN, '<&=', $self->stdin->fileno )
+ or croak("Can't open stdin: $!");
- binmode(STDIN);
+ binmode( STDIN );
- if ( $self->stdout ) {
+ if ( $self->stdout ) {
- open( $self->{restore}->{stdout}, '>&', STDOUT->fileno )
- or croak("Can't dup stdout: $!");
+ open( $self->{restore}->{stdout}, '>&', STDOUT->fileno )
+ or croak("Can't dup stdout: $!");
- open( STDOUT, '>&=', $self->stdout->fileno )
- or croak("Can't open stdout: $!");
+ open( STDOUT, '>&=', $self->stdout->fileno )
+ or croak("Can't open stdout: $!");
- binmode( $self->stdout );
- binmode(STDOUT);
- }
-
- if ( $self->stderr ) {
+ binmode( $self->stdout );
+ binmode( STDOUT);
+ }
- open( $self->{restore}->{stderr}, '>&', STDERR->fileno )
- or croak("Can't dup stderr: $!");
+ if ( $self->stderr ) {
- open( STDERR, '>&=', $self->stderr->fileno )
- or croak("Can't open stderr: $!");
+ open( $self->{restore}->{stderr}, '>&', STDERR->fileno )
+ or croak("Can't dup stderr: $!");
- binmode( $self->stderr );
- binmode(STDERR);
- }
+ open( STDERR, '>&=', $self->stderr->fileno )
+ or croak("Can't open stderr: $!");
+ binmode( $self->stderr );
+ binmode( STDERR );
}
{
return undef unless $self->stdout;
- require HTTP::Response;
-
seek( $self->stdout, 0, SEEK_SET )
or croak("Can't seek stdout handle: $!");
- my $message;
+ my $headers;
while ( my $line = $self->stdout->getline ) {
- $message .= $line;
- last if $message =~ /\x0d?\x0a\x0d?\x0a$/;
+ $headers .= $line;
+ last if $headers =~ /\x0d?\x0a\x0d?\x0a$/;
}
-
- unless ( $message =~ /^HTTP/ ) {
- $message = "HTTP/1.1 200 OK\x0d\x0a" . $message;
+
+ unless ( defined $headers ) {
+ $headers = "HTTP/1.1 500 Internal Server Error\x0d\x0a";
}
- my $response = HTTP::Response->new;
- my @headers = split( /\x0d?\x0a/, $message );
- my $status = shift(@headers);
-
- unless ( $status =~ s/^(HTTP\/\d\.\d) (\d{3}) (.*)$// ) {
- croak("Invalid Status-Line: '$status'");
+ unless ( $headers =~ /^HTTP/ ) {
+ $headers = "HTTP/1.1 200 OK\x0d\x0a" . $headers;
}
- $response->protocol($1);
- $response->code($2);
- $response->message($3);
+ my $response = HTTP::Response->parse($headers);
+ $response->date( time() ) unless $response->date;
- my $token = qr/[^][\x00-\x1f\x7f()<>@,;:\\"\/?={} \t]+/;
+ my $message = $response->message;
+ my $status = $response->header('Status');
- foreach my $header (@headers) {
+ if ( $message && $message =~ /^(.+)\x0d$/ ) {
+ $response->message($1);
+ }
- unless ( $header =~ s/^($token):[\t ]*// ) {
- croak("Invalid header field name : '$header'");
- }
+ if ( $status && $status =~ /^(\d\d\d)\s?(.+)?$/ ) {
- $response->push_header( $1 => $header );
- }
+ my $code = $1;
+ my $message = $2 || HTTP::Status::status_message($code);
- if ( my $code = $response->header('Status') ) {
$response->code($code);
- $response->message( HTTP::Status::status_message($code) );
+ $response->message($message);
}
+
+ my $length = ( stat( $self->stdout ) )[7] - tell( $self->stdout );
- $response->headers->date( time() );
+ if ( $response->code == 500 && !$length ) {
+
+ $response->content( $response->error_as_HTML );
+ $response->content_type('text/html');
+
+ return $response;
+ }
if ($callback) {
- $response->content(
- sub {
- if ( $self->stdout->read( my $buffer, 4096 ) ) {
- return $buffer;
- }
- return undef;
+
+ my $handle = $self->stdout;
+
+ $response->content( sub {
+
+ if ( $handle->read( my $buffer, 4096 ) ) {
+ return $buffer;
}
- );
+
+ return undef;
+ });
}
else {
+
my $length = 0;
+
while ( $self->stdout->read( my $buffer, 4096 ) ) {
$length += length($buffer);
$response->add_content($buffer);
%ENV = %{ $self->{restore}->{enviroment} };
}
- unless ( $self->rawhandles ) {
+ open( STDIN, '<&', $self->{restore}->{stdin} )
+ or croak("Can't restore stdin: $!");
- open( STDIN, '>&', $self->{restore}->{stdin} )
- or croak("Can't restore stdin: $!");
+ sysseek( $self->stdin, 0, SEEK_SET )
+ or croak("Can't seek stdin: $!");
- sysseek( $self->stdin, 0, SEEK_SET )
- or croak("Can't seek stdin: $!");
-
- if ( $self->{restore}->{stdout} ) {
+ if ( $self->{restore}->{stdout} ) {
- STDOUT->flush
- or croak("Can't flush stdout: $!");
+ STDOUT->flush
+ or croak("Can't flush stdout: $!");
- open( STDOUT, '>&', $self->{restore}->{stdout} )
- or croak("Can't restore stdout: $!");
-
- sysseek( $self->stdout, 0, SEEK_SET )
- or croak("Can't seek stdout: $!");
- }
+ open( STDOUT, '>&', $self->{restore}->{stdout} )
+ or croak("Can't restore stdout: $!");
- if ( $self->{restore}->{stderr} ) {
+ sysseek( $self->stdout, 0, SEEK_SET )
+ or croak("Can't seek stdout: $!");
+ }
- STDERR->flush
- or croak("Can't flush stderr: $!");
+ if ( $self->{restore}->{stderr} ) {
- open( STDERR, '>&', $self->{restore}->{stderr} )
- or croak("Can't restore stderr: $!");
+ STDERR->flush
+ or croak("Can't flush stderr: $!");
- sysseek( $self->stderr, 0, SEEK_SET )
- or croak("Can't seek stderr: $!");
- }
+ open( STDERR, '>&', $self->{restore}->{stderr} )
+ or croak("Can't restore stderr: $!");
+ sysseek( $self->stderr, 0, SEEK_SET )
+ or croak("Can't seek stderr: $!");
}
$self->{restored}++;
Setups the environment and descriptors.
-=item rawhandles
-
-Don't redefine STDIN/STDOUT/STDERR internally.
-
=item restore
Restores the enviroment and descriptors. Can only be called after setup.
projects / catagits/HTTP-Request-AsCGI.git / blobdiff