dougm       00/09/28 08:19:02

  Modified:    Constants Constants.pm
               .        Changes ToDo
  Log:
  make extra sure Apache::Constants::AUTOLOAD does not recurse looking
  for sub __AUTOLOAD
  
  Revision  Changes    Path
  1.21      +10 -3     modperl/Constants/Constants.pm
  
  Index: Constants.pm
  ===================================================================
  RCS file: /home/cvs/modperl/Constants/Constants.pm,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Constants.pm      2000/03/03 20:42:01     1.20
  +++ Constants.pm      2000/09/28 15:18:54     1.21
  @@ -17,9 +17,16 @@
   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;
  +        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");
  +        }
       };
   }
   
  
  
  
  1.532     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.531
  retrieving revision 1.532
  diff -u -r1.531 -r1.532
  --- Changes   2000/09/28 03:30:20     1.531
  +++ Changes   2000/09/28 15:18:58     1.532
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +make extra sure Apache::Constants::AUTOLOAD does not recurse looking
  +for sub __AUTOLOAD [Jim Winstead <[EMAIL PROTECTED]>]
  +
   fix %Apache::ReadConfig:: processing for PerlRequire'd files
   [Salvador Ortiz Garcia <[EMAIL PROTECTED]>]
   
  
  
  
  1.259     +0 -5      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.258
  retrieving revision 1.259
  diff -u -r1.258 -r1.259
  --- ToDo      2000/09/27 23:51:29     1.258
  +++ ToDo      2000/09/28 15:18:59     1.259
  @@ -9,16 +9,11 @@
   
   - changes for libapreq+win32 [Jiho Hahm <[EMAIL PROTECTED]>]
   
  -- Perl{Module,Require} is allowed in .htaccess, but also adds to
  -  cls->Perl{Module,Require} arrays, which it should not
  -
   - segfaults with DBI->connect (mysql), reported that downgrade to
     1.21_03 cures
   
   - Apache::read() does not clear $_[1] before appending data, bug or feature?
     [Cyrus Rahman <[EMAIL PROTECTED]>]
  -
  -- Apache::Constants::AUTOLOAD recursion [Jim Winstead <[EMAIL PROTECTED]>]
   
   - {get,set}_handlers troubles [Geoffrey Young <[EMAIL PROTECTED]>]
     see also: http://perl.apache.org/~dougm/set_handlers.pat
  
  
  

Reply via email to