handle request automatically on PLP::CGI import

[perl/plp/.git] / PLP / CGI.pm

diff --git a/PLP/CGI.pm b/PLP/CGI.pm
index 1e4d7de63b33b433244b48a3bfc0de022c6cc9d6..1f46a3c9852954a25d1fc279da38aa56dbb42b37 100644 (file)
--- a/PLP/CGI.pm
+++ b/PLP/CGI.pm
@@ -2,51 +2,78 @@ package PLP::CGI;
 
 use strict;
 
-our $VERSION = '1.00';
+our $VERSION = '1.02';
 
-# CGI initializer: parses PATH_TRANSLATED
+use PLP;
+
+# CGI initializer: opens SCRIPT_FILENAME
 sub init {
        $PLP::print = 'print';
-       
-       my $path = $ENV{PATH_TRANSLATED};
-       $ENV{PLP_NAME} = $ENV{PATH_INFO};
-       my $path_info;
-       while (not -f $path) {
-               if (not $path =~ s/(\/+[^\/]*)$//) {
-                       print STDERR "PLP: Not found: $ENV{PATH_TRANSLATED} ($ENV{REQUEST_URI})\n";
-                       PLP::error(undef, 404);
-                       exit;
+       $PLP::read = \&read;
+
+       if (defined $ENV{PATH_TRANSLATED}) {
+               # SCRIPT_* points to handler script (Apache CGI)
+               # Run backwards through PATH_TRANSLATED to find target filename,
+               # then get file (relative) by stripping PATH_INFO.
+               my ($path, $rel) = (delete $ENV{PATH_TRANSLATED}, delete $ENV{PATH_INFO});
+               my $path_info;
+               while (not -f $path) {
+                       if (not $path =~ s/(\/+[^\/]*)$//) {
+                               printf STDERR "PLP: Not found: $path$path_info ($ENV{REQUEST_URI})\n";
+                               PLP::error(undef, 404);
+                               return;
+                       }
+                       # move last path element onto PATH_INFO
+                       $path_info = $1 . $path_info;
+               }
+               if (defined $path_info) {
+                       $rel =~ s/\Q$path_info\E$//;
+                       $ENV{PATH_INFO} = $path_info;
                }
-               my $pi = $1;
-               $ENV{PLP_NAME} =~ s/\Q$pi\E$//;
-               $path_info = $pi . $path_info;
+               $ENV{SCRIPT_FILENAME} = $path;
+               $ENV{SCRIPT_NAME} = $rel;
        }
-       
-       if (not -r $path) {
-               print STDERR "PLP: Can't read: $ENV{PATH_TRANSLATED} ($ENV{REQUEST_URI})\n";
+       elsif (not -f $ENV{SCRIPT_FILENAME}) {
+               print STDERR "PLP: Not found: $ENV{SCRIPT_FILENAME} ($ENV{REQUEST_URI})\n";
+               PLP::error(undef, 404);
+               return;
+       }
+
+       $ENV{"PLP_$_"} = $ENV{"SCRIPT_$_"} for qw/NAME FILENAME/;
+
+       if (not -r $ENV{PLP_FILENAME}) {
+               print STDERR "PLP: Can't read: $ENV{PLP_FILENAME} ($ENV{REQUEST_URI})\n";
                PLP::error(undef, 403);
-               exit;
+               return;
        }
 
        delete @ENV{
-               qw(PATH_TRANSLATED SCRIPT_NAME SCRIPT_FILENAME PATH_INFO),
+               qw(SCRIPT_NAME SCRIPT_FILENAME),
                grep /^REDIRECT_/, keys %ENV
        };
 
-       $ENV{PATH_INFO} = $path_info if defined $path_info;
-       $ENV{PLP_FILENAME} = $path;
-       my ($file, $dir) = File::Basename::fileparse($path);
+       my ($file, $dir) = File::Basename::fileparse($ENV{PLP_FILENAME});
        chdir $dir;
 
-       $PLP::code = PLP::source($file, 0, undef, $path);
+       $PLP::code = PLP::source($file, 0, undef, $ENV{PLP_FILENAME});
+       return 1;
 }
 
-# This is run by the CGI script. (#!perl \n use PLP; PLP::everything;)
-#sub everything {
-#      clean();
-#      cgi_init();
-#      start();
-#}
+sub read ($) {
+       my ($bytes) = @_;
+       read *STDIN, my $data, $bytes;
+       return $data;
+}
+
+sub everything {
+       PLP::clean();
+       $_[0]->init() and PLP::start();
+}
+
+# This is run by the CGI script. (#!perl \n use PLP::CGI;)
+sub import {
+       $_[0]->everything();
+}
 
 1;