Created
July 1, 2010 00:02
-
-
Save tokuhirom/459382 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/lib/Plack/App/WrapCGI.pm b/lib/Plack/App/WrapCGI.pm | |
| index 7f0a7a7..925b2e9 100644 | |
| --- a/lib/Plack/App/WrapCGI.pm | |
| +++ b/lib/Plack/App/WrapCGI.pm | |
| @@ -2,7 +2,7 @@ package Plack::App::WrapCGI; | |
| use strict; | |
| use warnings; | |
| use parent qw(Plack::Component); | |
| -use Plack::Util::Accessor qw(script _app); | |
| +use Plack::Util::Accessor qw(script run_on_shell _app); | |
| use CGI::Emulate::PSGI; | |
| use CGI::Compile; | |
| use Carp; | |
| @@ -12,10 +12,62 @@ sub prepare_app { | |
| my $script = $self->script | |
| or croak "'script' is not set"; | |
| - my $sub = CGI::Compile->compile($script); | |
| - my $app = CGI::Emulate::PSGI->handler($sub); | |
| + if ($self->run_on_shell) { | |
| + my $app = sub { | |
| + my $env = shift; | |
| - $self->_app($app); | |
| + pipe( my $stdoutr, my $stdoutw ); | |
| + pipe( my $stdinr, my $stdinw ); | |
| + | |
| + | |
| + my $pid = fork(); | |
| + Carp::croak("fork failed: $!") unless defined $pid; | |
| + | |
| + | |
| + if ($pid == 0) { # child | |
| + local $SIG{__DIE__} = sub { | |
| + print STDERR @_; | |
| + exit(1); | |
| + }; | |
| + | |
| + close $stdoutr; | |
| + close $stdinw; | |
| + | |
| + local %ENV = (%ENV, CGI::Emulate::PSGI->emulate_environment($env)); | |
| + | |
| + open( STDOUT, ">&=" . fileno($stdoutw) ) | |
| + or Carp::croak "Cannot dup STDOUT: $!"; | |
| + open( STDIN, "<&=" . fileno($stdinr) ) | |
| + or Carp::croak "Cannot dup STDIN: $!"; | |
| + | |
| + exec($script) or Carp::croak("cannot exec: $!"); | |
| + | |
| + exit(2); | |
| + } | |
| + | |
| + close $stdoutw; | |
| + close $stdinr; | |
| + | |
| + syswrite($stdinw, do { | |
| + local $/; | |
| + my $fh = $env->{'psgi.input'}; | |
| + <$fh>; | |
| + }); | |
| + | |
| + 1 while waitpid( $pid, 0 ) <= 0; | |
| + if (POSIX::WIFEXITED($?)) { | |
| + return CGI::Parse::PSGI::parse_cgi_output($stdoutr); | |
| + } else { | |
| + Carp::croak("Error at run_on_shell CGI: $!"); | |
| + } | |
| + }; | |
| + $self->_app($app); | |
| + } else { | |
| + my $sub = CGI::Compile->compile($script); | |
| + my $app = CGI::Emulate::PSGI->handler($sub); | |
| + | |
| + $self->_app($app); | |
| + } | |
| } | |
| sub call { | |
| @@ -37,6 +89,9 @@ Plack::App::WrapCGI - Compiles a CGI script as PSGI application | |
| my $app = Plack::App::WrapCGI->new(script => "/path/to/script.pl")->to_app; | |
| + # if you want to execute as real CGI. | |
| + my $app = Plack::App::WrapCGI->new(script => "/path/to/script.rb", run_on_shell => 1)->to_app; | |
| + | |
| =head1 DESCRIPTION | |
| Plack::App::WrapCGI compiles a CGI script into a PSGI application | |
| diff --git a/t/Plack-Middleware/wrapcgi.t b/t/Plack-Middleware/wrapcgi.t | |
| index 9e72592..79e9ce0 100644 | |
| --- a/t/Plack-Middleware/wrapcgi.t | |
| +++ b/t/Plack-Middleware/wrapcgi.t | |
| @@ -4,6 +4,8 @@ use Test::Requires { 'CGI::Emulate::PSGI' => 0, 'CGI::Compile' => 0.03 }; | |
| use Plack::Test; | |
| use HTTP::Request::Common; | |
| use Plack::App::WrapCGI; | |
| +use IO::File; | |
| +use File::Temp; | |
| my $app = Plack::App::WrapCGI->new(script => "t/Plack-Middleware/cgi-bin/hello.cgi")->to_app; | |
| @@ -19,4 +21,33 @@ test_psgi app => $app, client => sub { | |
| is $res->content, "Hello bar counter=2"; | |
| }; | |
| +{ | |
| + my $tmp = File::Temp->new(CLEANUP => 1); | |
| + print $tmp <<"..."; | |
| +#!$^X | |
| +use CGI; | |
| +my \$q = CGI->new; | |
| +print \$q->header, "Hello ", \$q->param('name'), " counter=", ++\$COUNTER; | |
| +... | |
| + close $tmp; | |
| + | |
| + chmod(oct("0700"), $tmp->filename) or die "Cannot chmod"; | |
| + | |
| + my $app_exec = Plack::App::WrapCGI->new(script => "$tmp", 'run_on_shell' => 1)->to_app; | |
| + test_psgi app => $app_exec, client => sub { | |
| + my $cb = shift; | |
| + | |
| + my $res = $cb->(GET "http://localhost/?name=foo"); | |
| + is $res->code, 200; | |
| + is $res->content, "Hello foo counter=1"; | |
| + | |
| + $res = $cb->(POST "http://localhost/", ['name' => 'bar']); | |
| + is $res->code, 200; | |
| + is $res->content, "Hello bar counter=1"; | |
| + }; | |
| + | |
| + undef $tmp; | |
| +}; | |
| + | |
| + | |
| done_testing; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment