Author: geoff Date: Thu Mar 17 11:44:07 2005 New Revision: 157969 URL: http://svn.apache.org/viewcvs?view=rev&rev=157969 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/branches/apache2-rename-unstable/Changes perl/modperl/branches/apache2-rename-unstable/Makefile.PL perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_env.c perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm Modified: perl/modperl/branches/apache2-rename-unstable/Changes URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/Changes?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/Changes (original) +++ perl/modperl/branches/apache2-rename-unstable/Changes Thu Mar 17 11:44:07 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] + remove MP_INST_APACHE2 installation option and Apache2.pm - all mod_perl related files will now be installed so they are visible via standard @INC. also, refuse to install over mod_perl 2 versions Modified: perl/modperl/branches/apache2-rename-unstable/Makefile.PL URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/Makefile.PL?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/Makefile.PL (original) +++ perl/modperl/branches/apache2-rename-unstable/Makefile.PL Thu Mar 17 11:44:07 2005 @@ -159,6 +159,10 @@ exit 1; } } + else { + print "no prior mod_perl version found - good.\n"; + + } # On Win32, in order to decouple APR::* from mod_perl.so, we # make up a static library MP_APR_LIB of the symbols required from @@ -456,7 +460,8 @@ } close $fh; - $build->{VERSION} = $VERSION; + $build->{VERSION} = $VERSION; + $build->{API_VERSION} = $mod_perl2::API_VERSION; } # needs to be run after configure() when apxs is setup Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm Thu Mar 17 11:44:07 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/branches/apache2-rename-unstable/lib/mod_perl2.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm Thu Mar 17 11:44:07 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; } $mod_perl::VERSION = $mod_perl2::VERSION; Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_env.c URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_env.c?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_env.c (original) +++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_env.c Thu Mar 17 11:44:07 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/branches/apache2-rename-unstable/t/conf/modperl_extra.pl URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl (original) +++ perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl Thu Mar 17 11:44:07 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/branches/apache2-rename-unstable/t/response/TestModperl/env.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm Thu Mar 17 11:44:07 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/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm Thu Mar 17 11:44:07 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/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm?view=diff&r1=157968&r2=157969 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm (original) +++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm Thu Mar 17 11:44:07 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"; }