Author: pgollucci
Date: Sun Sep 11 22:39:27 2005
New Revision: 280262
URL: http://svn.apache.org/viewcvs?rev=280262&view=rev
Log:
Tweak the handling of the backcomat @INC handling for mod_perl.pm to
help tools such as Apache2::Status not display erroneous information.
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Status.pm
perl/modperl/trunk/lib/mod_perl2.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=280262&r1=280261&r2=280262&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sun Sep 11 22:39:27 2005
@@ -12,6 +12,10 @@
=item 2.0.2-dev
+Prevent tools such as Apache2::Status's Loaded Modules screen
+from displaying erroneous information about mod_perl.pm being loaded.
+[Stas, Philip M. Gollucci]
+
Correctly set the version of ModPerl::MethodLookup, previously,
it was not set because of the way it was Generating via ModPerl::WrapXS.
[Philip M. Gollucci]
Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?rev=280262&r1=280261&r2=280262&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Sun Sep 11 22:39:27 2005
@@ -210,6 +210,7 @@
next if $file =~ m:^/:;
next unless $file =~ m:\.pm:;
next unless $INC{$file}; #e.g. fake Apache2/TieHandle.pm
+ next if $module eq 'mod_perl';
no strict 'refs';
(my $module = $file) =~ s,/,::,g;
Modified: perl/modperl/trunk/lib/mod_perl2.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/mod_perl2.pm?rev=280262&r1=280261&r2=280262&view=diff
==============================================================================
--- perl/modperl/trunk/lib/mod_perl2.pm (original)
+++ perl/modperl/trunk/lib/mod_perl2.pm Sun Sep 11 22:39:27 2005
@@ -16,6 +16,7 @@
use 5.006;
use strict;
+use File::Spec::Functions;
BEGIN {
our $VERSION = "2.000002";
@@ -48,7 +49,7 @@
# startup you are protected against loading mod_perl.pm
# (either 1.0 or 1.99) at a later time by accident.
$mod_perl::VERSION = $mod_perl2::VERSION;
-$INC{"mod_perl.pm"} = __FILE__;
+$INC{"mod_perl.pm"} = File::Spec::Functions::devnull();
1;
__END__
