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 ge...@apache.org on 2005/03/18 01:59:41 UTC
svn commit: r158000 - in perl/modperl/trunk: Changes Makefile.PL
lib/ModPerl/Code.pm lib/mod_perl.pm src/modules/perl/modperl_env.c
t/conf/modperl_extra.pl t/response/TestModperl/env.pm
t/response/TestModules/cgi.pm t/response/TestModules/cgi2.pm
Author: geoff
Date: Thu Mar 17 16:59:38 2005
New Revision: 158000
URL: http://svn.apache.org/viewcvs?view=rev&rev=158000
Log:
add $ENV{MOD_PERL_API_VERSION} as something that clearly distinguishes
which mod_perl version is being used at request time.
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/Makefile.PL
perl/modperl/trunk/lib/ModPerl/Code.pm
perl/modperl/trunk/lib/mod_perl.pm
perl/modperl/trunk/src/modules/perl/modperl_env.c
perl/modperl/trunk/t/conf/modperl_extra.pl
perl/modperl/trunk/t/response/TestModperl/env.pm
perl/modperl/trunk/t/response/TestModules/cgi.pm
perl/modperl/trunk/t/response/TestModules/cgi2.pm
Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Thu Mar 17 16:59:38 2005
@@ -12,6 +12,9 @@
=item 1.999_22-dev
+add $ENV{MOD_PERL_API_VERSION} as something that clearly distinguishes
+which mod_perl version is being used at request time. [Geoffrey Young]
+
Starting from ExtUtils::MakeMaker 6.26 went back to pm_to_blib target
from pm_to_blib.ts introduced in 6.22, so needed to fix the glue_pod
target, so install will work correctly [Stas]
Modified: perl/modperl/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Thu Mar 17 16:59:38 2005
@@ -479,7 +479,8 @@
}
close $fh;
- $build->{VERSION} = $VERSION;
+ $build->{VERSION} = $VERSION;
+ $build->{API_VERSION} = $mod_perl::API_VERSION;
}
# needs to be run after configure() when apxs is setup
Modified: perl/modperl/trunk/lib/ModPerl/Code.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Code.pm?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/Code.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Code.pm Thu Mar 17 16:59:38 2005
@@ -501,9 +501,14 @@
sub generate_trace {
my($self, $h_fh) = @_;
- my $v = $self->{build}->{VERSION};
+ my $v = $self->{build}->{VERSION};
+ my $api_v = $self->{build}->{API_VERSION};
print $h_fh qq(#define MP_VERSION_STRING "mod_perl/$v"\n);
+
+ # this needs to be a string, not an int, because of the
+ # macro definition. patches welcome.
+ print $h_fh qq(#define MP_API_VERSION "$api_v"\n);
my $i = 1;
my @trace = sort keys %trace;
Modified: perl/modperl/trunk/lib/mod_perl.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/mod_perl.pm?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/lib/mod_perl.pm (original)
+++ perl/modperl/trunk/lib/mod_perl.pm Thu Mar 17 16:59:38 2005
@@ -34,6 +34,10 @@
# $VERSION : "1.099020"
# int $VERSION : 1.09902
# $VERSION_TRIPLET: 1.99.20
+
+ # easy to parse request time API version - use
+ # $mod_perl2::VERSION for more granularity
+ our $API_VERSION = 2;
}
1;
Modified: perl/modperl/trunk/src/modules/perl/modperl_env.c
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_env.c?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_env.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_env.c Thu Mar 17 16:59:38 2005
@@ -73,6 +73,7 @@
static modperl_env_ent_t MP_env_const_vars[] = {
MP_ENV_ENT("MOD_PERL", MP_VERSION_STRING),
+ MP_ENV_ENT("MOD_PERL_API_VERSION", MP_API_VERSION),
{ NULL }
};
Modified: perl/modperl/trunk/t/conf/modperl_extra.pl
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/conf/modperl_extra.pl?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/t/conf/modperl_extra.pl (original)
+++ perl/modperl/trunk/t/conf/modperl_extra.pl Thu Mar 17 16:59:38 2005
@@ -19,6 +19,8 @@
use warnings FATAL => 'all';
die '$ENV{MOD_PERL} not set!' unless $ENV{MOD_PERL};
+die '$ENV{MOD_PERL_API_VERSION} not set!'
+ unless $ENV{MOD_PERL_API_VERSION} == 2;
use File::Spec::Functions qw(canonpath catdir);
Modified: perl/modperl/trunk/t/response/TestModperl/env.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/env.pm?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/env.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/env.pm Thu Mar 17 16:59:38 2005
@@ -14,12 +14,13 @@
sub handler {
my $r = shift;
- plan $r, tests => 22 + keys(%ENV);
+ plan $r, tests => 23 + keys(%ENV);
my $env = $r->subprocess_env;
ok $ENV{MODPERL_EXTRA_PL}; #set in t/conf/modperl_extra.pl
ok $ENV{MOD_PERL};
+ ok $ENV{MOD_PERL_API_VERSION};
ok $ENV{SERVER_SOFTWARE};
ok $env->get('SERVER_SOFTWARE');
Modified: perl/modperl/trunk/t/response/TestModules/cgi.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgi.pm?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgi.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgi.pm Thu Mar 17 16:59:38 2005
@@ -15,6 +15,10 @@
die "\$ENV{MOD_PERL} is not set";
}
+ unless ($ENV{MOD_PERL_API_VERSION} == 2) {
+ die "\$ENV{MOD_PERL_API_VERSION} is not set";
+ }
+
if ($CGI::Q) {
die "CGI.pm globals were not reset";
}
Modified: perl/modperl/trunk/t/response/TestModules/cgi2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgi2.pm?view=diff&r1=157999&r2=158000
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgi2.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgi2.pm Thu Mar 17 16:59:38 2005
@@ -18,6 +18,10 @@
die "\$ENV{MOD_PERL} is not set";
}
+ unless ($ENV{MOD_PERL_API_VERSION} == 2) {
+ die "\$ENV{MOD_PERL_API_VERSION} is not set";
+ }
+
if ($CGI::Q) {
die "CGI.pm globals were not reset";
}