X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=lib%2Findirect.pm;h=7c2bab120e97667ef656be5f767e279efa1ab440;hp=734896a4d6db6bd5ac02a1a971996d13b8b7ae63;hb=472dba145dd39b08abd25fbb0b1b9fc8697b6575;hpb=3073451bb3c0e963ca447441f101f00c29f50f03

diff --git a/lib/indirect.pm b/lib/indirect.pm
index 734896a..7c2bab1 100644
--- a/lib/indirect.pm
+++ b/lib/indirect.pm
@@ -11,13 +11,13 @@ indirect - Lexically warn about using the indirect object syntax.
 
 =head1 VERSION
 
-Version 0.16
+Version 0.18
 
 =cut
 
 our $VERSION;
 BEGIN {
- $VERSION = '0.16';
+ $VERSION = '0.18';
 }
 
 =head1 SYNOPSIS
@@ -58,8 +58,13 @@ This module is B<not> a source filter.
 =cut
 
 BEGIN {
- require XSLoader;
- XSLoader::load(__PACKAGE__, $VERSION);
+ if ($ENV{PERL_INDIRECT_PM_DISABLE}) {
+  *_tag = sub ($) { 1 };
+  *I_THREADSAFE = sub () { 1 };
+ } else {
+  require XSLoader;
+  XSLoader::load(__PACKAGE__, $VERSION);
+ }
 }
 
 =head1 METHODS
@@ -153,6 +158,17 @@ The default warning/exception message thrown when an indirect call on an object
 
 The default warning/exception message thrown when an indirect call on a block is found.
 
+=head1 ENVIRONMENT
+
+=head2 C<PERL_INDIRECT_PM_DISABLE>
+
+If this environment variable is set to true when the pragma is used for the first time, the XS code won't be loaded and, although the C<'indirect'> lexical hint will be set to true in the scope of use, the pragma itself won't do anything.
+In this case, the pragma will always be considered to be thread-safe, and as such L</I_THREADSAFE> will be true.
+This is useful for disabling C<indirect> in production environments.
+
+Note that clearing this variable after C<indirect> was loaded has no effect.
+If you want to reenable the pragma later, you also need to reload it by deleting the C<'indirect.pm'> entry from C<%INC>.
+
 =head1 CAVEATS
 
 The implementation was tweaked to work around several limitations of vanilla C<perl> pragmas : it's thread safe, and doesn't suffer from a C<perl 5.8.x-5.10.0> bug that causes all pragmas to propagate into C<require>d scopes.
@@ -162,6 +178,9 @@ C<meth $obj> (no semicolon) at the end of a file won't be seen as an indirect ob
 With 5.8 perls, the pragma does not propagate into C<eval STRING>.
 This is due to a shortcoming in the way perl handles the hints hash, which is addressed in perl 5.10.
 
+The search for indirect method calls happens before constant folding.
+Hence C<my $x = new Class if 0> will be caught.
+
 =head1 DEPENDENCIES
 
 L<perl> 5.8.