From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 28 May 2008 11:41:13 +0000 (+0000)
Subject: keep SCRIPT_* environment variables in CGI
X-Git-Tag: 3.20~2
X-Git-Url: http://git.shiar.net/perl/plp/.git/commitdiff_plain/0037699647feb915a9091a57af1a264777bcaecb

keep SCRIPT_* environment variables in CGI

These are now identical to their PLP_* counterparts, and should be used
instead for familiarity (why rename for no apparant reason; SCRIPT_* now
contain their expected values so no reason to suggest otherwise).
Apache already has both.
---

diff --git a/lib/PLP.pm b/lib/PLP.pm
index 03c4acb..acf3871 100644
--- a/lib/PLP.pm
+++ b/lib/PLP.pm
@@ -364,14 +364,18 @@ These are described in L<PLP::Functions>.
 
 =over 22
 
-=item $ENV{PLP_NAME}
+=item $ENV{SCRIPT_NAME}
 
 The URI of the PLP document, without the query string. (Example: C</foo.plp>)
 
-=item $ENV{PLP_FILENAME}
+Used to be renamed to C<$ENV{PLP_NAME}>, which is still provided but deprecated.
+
+=item $ENV{SCRIPT_FILENAME}
 
 The filename of the PLP document. (Example: C</var/www/index.plp>)
 
+C<$ENV{PLP_SCRIPT}> also still provided but deprecated.
+
 =item $PLP::VERSION
 
 The version of PLP.
diff --git a/lib/PLP/Backend/CGI.pm b/lib/PLP/Backend/CGI.pm
index 5d45500..0005762 100644
--- a/lib/PLP/Backend/CGI.pm
+++ b/lib/PLP/Backend/CGI.pm
@@ -48,7 +48,6 @@ sub init {
 	}
 
 	delete @ENV{
-		qw(SCRIPT_NAME SCRIPT_FILENAME),
 		grep /^REDIRECT_/, keys %ENV
 	};