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

[dougm]

dougm       00/09/27 20:53:02

  Modified:    src/modules/perl perl_config.c
  Log:
  fix %Apache::ReadConfig:: processing for PerlRequire'd files
  
  Revision  Changes    Path
  1.107     +16 -18    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.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- perl_config.c     2000/09/27 23:51:34     1.106
  +++ perl_config.c     2000/09/28 03:53:01     1.107
  @@ -600,21 +600,20 @@
                dTHRCTX;
                return SvPV(ERRSV,n_a);
            }
  -     }
  -     else {
  -         return NULL;
  +#ifdef PERL_SECTIONS
  +            else {
  +                if (CAN_SELF_BOOT_SECTIONS) {
  +                    perl_section_self_boot(parms, dummy, arg);
  +                }
  +         }
  +#endif
        }
       }
  -
  -    if (cls->PerlModule) {
  +    else {
  +        /* Delay processing it until Perl starts */
           *(char **)push_array(cls->PerlModule) = pstrdup(parms->pool, arg);
       }
   
  -#ifdef PERL_SECTIONS
  -    if(CAN_SELF_BOOT_SECTIONS)
  -     perl_section_self_boot(parms, dummy, arg);
  -#endif
  -
       return NULL;
   }
   
  @@ -633,20 +632,19 @@
                dTHRCTX;
                return SvPV(ERRSV,n_a);
            }
  +#ifdef PERL_SECTIONS
            else {
  -             return NULL;
  +                if (CAN_SELF_BOOT_SECTIONS) {
  +                    perl_section_self_boot(parms, dummy, arg);
  +                }
            }
  +#endif
        }
       }
  -
  -    if (cls->PerlRequire) {
  +    else {
  +        /* Delay processing it until Perl starts */
           *(char **)push_array(cls->PerlRequire) = pstrdup(parms->pool, arg);
       }
  -
  -#ifdef PERL_SECTIONS
  -    if(CAN_SELF_BOOT_SECTIONS)
  -     perl_section_self_boot(parms, dummy, arg);
  -#endif
   
       return NULL;
   }