You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2005/04/08 19:29:59 UTC
svn commit: r160567 - in perl/modperl/trunk: Changes lib/Apache2/Status.pm
Author: stas
Date: Fri Apr 8 10:29:58 2005
New Revision: 160567
URL: http://svn.apache.org/viewcvs?view=rev&rev=160567
Log:
fix Apache2::Status which was bailing out on trying to load modules
with dev versions like 2.121_02
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Status.pm
Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&r1=160566&r2=160567
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Apr 8 10:29:58 2005
@@ -38,6 +38,9 @@
Apache->server() to Apache2::ServerUtil->server()
[Geoffrey Young]
+fix Apache2::Status which was bailing out on trying to load modules
+with dev versions like 2.121_02 [Stas]
+
When parsing Makefile.PL MP_* options, handle correctly the MP_FOO=0
entries [Philip M. Gollucci <pg...@p6m7g8.com>]
Modified: perl/modperl/trunk/lib/Apache2/Status.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Status.pm?view=diff&r1=160566&r2=160567
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Status.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Status.pm Fri Apr 8 10:29:58 2005
@@ -82,7 +82,9 @@
# if !$opt we skip the testing for the option
return 0 if $opt && !status_config($r, $opt);
return 0 unless eval { require $file };
- return 0 unless $module->VERSION && $module->VERSION >= $version;
+ my $mod_ver = $module->VERSION;
+ $mod_ver =~ s/_.*//; # handle dev versions like 2.121_02
+ return 0 unless $mod_ver && $mod_ver >= $version;
return 1;
}