cvs commit: modperl-2.0/src/modules/perl mod_perl.c

[dougm]

dougm       01/09/12 19:10:35

  Modified:    src/modules/perl mod_perl.c
  Log:
  add a bootstrap note for APR
  
  Revision  Changes    Path
  1.65      +13 -5     modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mod_perl.c        2001/09/10 04:43:03     1.64
  +++ mod_perl.c        2001/09/13 02:10:35     1.65
  @@ -24,13 +24,21 @@
   }
   #endif
   
  -static void my_xs_init(pTHX)
  +static const char *MP_xs_loaders[] = {
  +    "ModPerl", "APR", NULL,
  +};
  +
  +#define MP_xs_loader_name "%s::XSLoader::BOOTSTRAP"
  +
  +static void modperl_xs_init(pTHX)
   {
  +    int i;
       xs_init(aTHX); /* see modperl_xsinit.c */
   
  -    newCONSTSUB(PL_defstash,
  -                "ModPerl::XSLoader::BOOTSTRAP",
  -                newSViv(1));
  +    for (i=0; MP_xs_loaders[i]; i++) {
  +        char *name = Perl_form(aTHX_ MP_xs_loader_name, MP_xs_loaders[i]);
  +        newCONSTSUB(PL_defstash, name, newSViv(1));
  +    }
   }
   
   PerlInterpreter *modperl_startup(server_rec *s, apr_pool_t *p)
  @@ -65,7 +73,7 @@
           PL_perl_destruct_level = 2;
       }
   #endif
  -    status = perl_parse(perl, my_xs_init, argc, argv, NULL);
  +    status = perl_parse(perl, modperl_xs_init, argc, argv, NULL);
   
       if (status) {
           perror("perl_parse");