perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/t/net/perl dirty-test.cgi
Date Wed, 04 Aug 1999 01:56:14 GMT
dougm       99/08/03 18:56:14

  Modified:    .        Changes
               Constants Constants.pm
               lib/Apache PerlRun.pm Registry.pm
               t/modules sandwich.t
               t/net/perl dirty-test.cgi
  Log:
  careful w/ OPT_EXECCGI preloading
  fix modules/sandwich test
  
  Revision  Changes    Path
  1.332     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.331
  retrieving revision 1.332
  diff -u -r1.331 -r1.332
  --- Changes	1999/08/04 00:31:24	1.331
  +++ Changes	1999/08/04 01:56:10	1.332
  @@ -8,6 +8,8 @@
   
   =item 1.21_01-dev
   
  +fix modules/sandwich test
  +
   apxs/aix port [Paul J. Reder <rederpj@raleigh.ibm.com>]
   
   preload Apache::Contstants::OPT_EXECCGI() for Apache::{Registry,PerlRun}
  
  
  
  1.19      +7 -4      modperl/Constants/Constants.pm
  
  Index: Constants.pm
  ===================================================================
  RCS file: /home/cvs/modperl/Constants/Constants.pm,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Constants.pm	1999/08/03 23:25:12	1.18
  +++ Constants.pm	1999/08/04 01:56:11	1.19
  @@ -14,10 +14,13 @@
       *import = \&Exporter::import;
   }
   
  -sub AUTOLOAD {
  -                    #why must we stringify first???
  -    __AUTOLOAD() if "$Apache::Constants::AUTOLOAD"; 
  -    goto &$Apache::Constants::AUTOLOAD;
  +if ($ENV{MOD_PERL}) {
  +    #outside of mod_perl this will recurse looking for __AUTOLOAD, grr
  +    *AUTOLOAD  = sub {
  +	#why must we stringify first???
  +	__AUTOLOAD() if "$Apache::Constants::AUTOLOAD"; 
  +	goto &$Apache::Constants::AUTOLOAD;
  +    };
   }
   
   my %ConstNameCache = ();
  
  
  
  1.19      +1 -1      modperl/lib/Apache/PerlRun.pm
  
  Index: PerlRun.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/PerlRun.pm,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- PerlRun.pm	1999/08/04 00:04:02	1.18
  +++ PerlRun.pm	1999/08/04 01:56:12	1.19
  @@ -5,7 +5,7 @@
   use Apache::Constants qw(:common &OPT_EXECCGI);
   
   BEGIN {
  -    OPT_EXECCGI(); #preload, :common are alread pre-loaded
  +    OPT_EXECCGI() if $ENV{MOD_PERL}; #preload, :common are alread pre-loaded
   }
   
   unless (defined $Apache::Registry::NameWithVirtualHost) {
  
  
  
  1.23      +1 -1      modperl/lib/Apache/Registry.pm
  
  Index: Registry.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/Registry.pm,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Registry.pm	1999/08/04 00:04:02	1.22
  +++ Registry.pm	1999/08/04 01:56:12	1.23
  @@ -4,7 +4,7 @@
   use Apache::Constants qw(:common &OPT_EXECCGI);
   
   BEGIN {
  -    OPT_EXECCGI(); #preload, :common are alread pre-loaded
  +    OPT_EXECCGI() if $ENV{MOD_PERL}; #preload, :common are alread pre-loaded
   }
   
   $Apache::Registry::VERSION = '2.01';
  
  
  
  1.2       +1 -1      modperl/t/modules/sandwich.t
  
  Index: sandwich.t
  ===================================================================
  RCS file: /home/cvs/modperl/t/modules/sandwich.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sandwich.t	1997/12/06 17:57:28	1.1
  +++ sandwich.t	1999/08/04 01:56:13	1.2
  @@ -7,5 +7,5 @@
   
   print "1..1\n";
   
  -test ++$n, simple_fetch "/subr/";
  +test ++$n, simple_fetch "/subr/index.html";
   
  
  
  
  1.4       +2 -2      modperl/t/net/perl/dirty-test.cgi
  
  Index: dirty-test.cgi
  ===================================================================
  RCS file: /home/cvs/modperl/t/net/perl/dirty-test.cgi,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dirty-test.cgi	1999/01/21 00:38:24	1.3
  +++ dirty-test.cgi	1999/08/04 01:56:14	1.4
  @@ -15,8 +15,8 @@
   my $i = 0;
   
   test ++$i, not defined &subroutine;
  -test ++$i, not defined @array;
  -test ++$i, not defined %hash;
  +test ++$i, not *{"array"}{ARRAY};
  +test ++$i, not *{"hash"}{HASH};
   test ++$i, not defined $scalar;
   test ++$i, not defined fileno(FH);
   test ++$i, Outside::imported() == 4;
  
  
  

Mime
View raw message