dougm 02/03/23 18:07:58 Modified: . Changes Makefile.PL STATUS Constants Constants.pm Log: workaround Apache::Constants::AUTOLOAD problem with bleedperl Revision Changes Path 1.627 +2 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.626 retrieving revision 1.627 diff -u -r1.626 -r1.627 --- Changes 22 Mar 2002 19:58:13 -0000 1.626 +++ Changes 24 Mar 2002 02:07:58 -0000 1.627 @@ -10,6 +10,8 @@ =item 1.26_01-dev +workaround Apache::Constants::AUTOLOAD problem with bleedperl + the first flag argument to perl cannot start with space, since perl tries to open the " -spi.bak" as a file. fix that in the win32 case. [Stas Bekman <[EMAIL PROTECTED]>] 1.198 +1 -1 modperl/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl/Makefile.PL,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- Makefile.PL 22 Mar 2002 19:58:13 -0000 1.197 +++ Makefile.PL 24 Mar 2002 02:07:58 -0000 1.198 @@ -96,7 +96,7 @@ my $PWD = cwd; $ENV{APACHE_CWD} = $PWD; -$ENV{PERL5LIB} = "$PWD/lib"; +$ENV{PERL5LIB} = join ':', "$PWD/lib", $ENV{PERL5LIB}; my %SSL = ( "modules/ssl/apache_ssl.c" => "Ben-SSL", 1.3 +1 -5 modperl/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/modperl/STATUS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- STATUS 22 Mar 2002 20:03:34 -0000 1.2 +++ STATUS 24 Mar 2002 02:07:58 -0000 1.3 @@ -1,5 +1,5 @@ mod_perl 1.3 STATUS: - Last modified at [$Date: 2002/03/22 20:03:34 $] + Last modified at [$Date: 2002/03/24 02:07:58 $] Release: @@ -124,10 +124,6 @@ * bleedperl TIEHANDLE issues? Report: http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=99909095916498&w=2 Status: - - * bleedperl AUTOLOAD XSUB issues - Report: http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=101477676216889&w=2 - Status: * Apache->request(bless {r => $r}, 'My::Apache') Report: http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=98600785703290&w=2 1.22 +14 -12 modperl/Constants/Constants.pm Index: Constants.pm =================================================================== RCS file: /home/cvs/modperl/Constants/Constants.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Constants.pm 28 Sep 2000 15:18:54 -0000 1.21 +++ Constants.pm 24 Mar 2002 02:07:58 -0000 1.22 @@ -14,20 +14,22 @@ *import = \&Exporter::import; } +sub autoload { + if (defined &__AUTOLOAD) { #make extra sure we don't recurse + #why must we stringify first??? + __AUTOLOAD() if "$Apache::Constants::AUTOLOAD"; + goto &$Apache::Constants::AUTOLOAD; + } + else { + require Carp; + Carp::confess("__AUTOLOAD is undefined, ", + "trying to AUTOLOAD $Apache::Constants::AUTOLOAD"); + } +} + if ($ENV{MOD_PERL}) { #outside of mod_perl this will recurse looking for __AUTOLOAD, grr - *AUTOLOAD = sub { - if (defined &__AUTOLOAD) { #make extra sure we don't recurse - #why must we stringify first??? - __AUTOLOAD() if "$Apache::Constants::AUTOLOAD"; - goto &$Apache::Constants::AUTOLOAD; - } - else { - require Carp; - Carp::confess("__AUTOLOAD is undefined, ", - "trying to AUTOLOAD $Apache::Constants::AUTOLOAD"); - } - }; + *AUTOLOAD = \&autoload; } my %ConstNameCache = ();