X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/0daff7b8f9f15f54cfd2af57e4c8f868db199dda..96959bff080392067524996e6edbf954:/PLP.pm?ds=sidebyside
diff --git a/PLP.pm b/PLP.pm
index 6d6a520..e7ec30c 100644
--- a/PLP.pm
+++ b/PLP.pm
@@ -10,330 +10,242 @@ use PLP::Tie::Print;
use File::Basename ();
use File::Spec;
-use Cwd ();
use strict;
-our $VERSION = '3.18';
+our $VERSION = '3.19';
# Subs in this package:
# _default_error($plain, $html) Default error handler
-# cgi_init Initialization for CGI
# clean Reset variables
# error($error, $type) Handle errors
# everything Do everything: CGI
# handler($r) Do everything: mod_perl
-# mod_perl_init($r) Initialization for mod_perl
-# mod_perl_print Faster printing for mod_perl
# sendheaders Send headers
# source($path, $level, $linespec) Read and parse .plp files
# start Start the initialized PLP script
# The _init subs do the following:
# Set $PLP::code to the initial code
-# Set $ENV{PLP_*} and makes PATH_INFO if needed
+# Set $ENV{PLP_*} and make PATH_INFO if needed
# Change the CWD
# This gets referenced as the initial $PLP::ERROR
sub _default_error {
- my ($plain, $html) = @_;
- print qq{
},
- qq{Debug information: $html |
};
-}
-
-# CGI initializer: parses PATH_TRANSLATED
-sub cgi_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;
- }
- my $pi = $1;
- $ENV{PLP_NAME} =~ s/\Q$pi\E$//;
- $path_info = $pi . $path_info;
- }
-
- if (not -r $path) {
- print STDERR "PLP: Can't read: $ENV{PATH_TRANSLATED} ($ENV{REQUEST_URI})\n";
- PLP::error(undef, 403);
- exit;
- }
-
- delete @ENV{
- qw(PATH_TRANSLATED SCRIPT_NAME SCRIPT_FILENAME PATH_INFO),
- grep /^REDIRECT_/, keys %ENV
- };
-
- $ENV{PATH_INFO} = $path_info if defined $path_info;
- $ENV{PLP_FILENAME} = $path;
- my ($file, $dir) = File::Basename::fileparse($path);
- chdir $dir;
-
- $PLP::code = PLP::source($file, 0, undef, $path);
+ my ($plain, $html) = @_;
+ print qq{},
+ qq{Debug information: $html |
};
}
# This cleans up from previous requests, and sets the default $PLP::DEBUG
sub clean {
- @PLP::END = ();
- $PLP::code = '';
- $PLP::sentheaders = 0;
- $PLP::DEBUG = 1;
- $PLP::print = '';
- $PLP::r = undef;
- delete @ENV{ grep /^PLP_/, keys %ENV };
+ @PLP::END = ();
+ $PLP::code = '';
+ $PLP::sentheaders = 0;
+ $PLP::DEBUG = 1;
+ $PLP::print = '';
+ delete @ENV{ grep /^PLP_/, keys %ENV };
}
# Handles errors, uses subref $PLP::ERROR (default: \&_default_error)
sub error {
- my ($error, $type) = @_;
- if (not defined $type or $type < 100) {
- return undef unless $PLP::DEBUG & 1;
- my $plain = $error;
- (my $html = $plain) =~ s/([<&>])/'' . ord($1) . ';'/ge;
- PLP::sendheaders() unless $PLP::sentheaders;
- $PLP::ERROR->($plain, $html);
- } else {
- select STDOUT;
- my ($short, $long) = @{
- +{
- 404 => [
- 'Not Found',
- "The requested URL $ENV{REQUEST_URI} was not found " .
- "on this server."
- ],
- 403 => [
- 'Forbidden',
- "You don't have permission to access $ENV{REQUEST_URI} " .
- "on this server."
- ],
- }->{$type}
- };
- print "Status: $type\nContent-Type: text/html\n\n",
- qq{\n},
- "\n$type $short\n\n$short",
- "
\n$long\n
\n$ENV{SERVER_SIGNATURE}