cvs commit: modperl/src/modules/perl perl_config.c

[dougm]

dougm       00/09/26 14:02:44

  Modified:    .        Changes
               src/modules/perl perl_config.c
  Log:
  fix for Perl{Module,Require} in .htaccess
  
  Revision  Changes    Path
  1.524     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.523
  retrieving revision 1.524
  diff -u -r1.523 -r1.524
  --- Changes   2000/09/26 20:11:03     1.523
  +++ Changes   2000/09/26 21:02:36     1.524
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +fix for Perl{Module,Require} in .htaccess,
  +thanks to Will Trillich and Andrew Gideon for the spot
  +
   static+apaci fixes for aix [Jens-Uwe Mager <[EMAIL PROTECTED]>]
   
   fix bug in Perl{Set,Add}Var so $r->dir_config->get('key') sees the
  
  
  
  1.104     +7 -2      modperl/src/modules/perl/perl_config.c
  
  Index: perl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- perl_config.c     2000/09/26 20:05:22     1.103
  +++ perl_config.c     2000/09/26 21:02:42     1.104
  @@ -587,8 +587,11 @@
            return NULL;
        }
       }
  -    *(char **)push_array(cls->PerlModule) = pstrdup(parms->pool, arg);
   
  +    if (cld->PerlModule) {
  +        *(char **)push_array(cls->PerlModule) = pstrdup(parms->pool, arg);
  +    }
  +
   #ifdef PERL_SECTIONS
       if(CAN_SELF_BOOT_SECTIONS)
        perl_section_self_boot(parms, dummy, arg);
  @@ -618,7 +621,9 @@
        }
       }
   
  -    *(char **)push_array(cls->PerlRequire) = pstrdup(parms->pool, arg);
  +    if (cls->PerlRequire) {
  +        *(char **)push_array(cls->PerlRequire) = pstrdup(parms->pool, arg);
  +    }
   
   #ifdef PERL_SECTIONS
       if(CAN_SELF_BOOT_SECTIONS)