perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0/src/modules/perl mod_perl.c
Date Mon, 07 Apr 2003 01:14:16 GMT
stas        2003/04/06 18:14:15

  Modified:    src/modules/perl mod_perl.c
  Log:
  fix the problem of +Clone vhost not getting their own mip (was lost while
  moving the mip initialization code prior to modules loading)
  
  Revision  Changes    Path
  1.165     +9 -18     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.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- mod_perl.c	6 Apr 2003 23:49:46 -0000	1.164
  +++ mod_perl.c	7 Apr 2003 01:14:15 -0000	1.165
  @@ -190,25 +190,11 @@
       perl_run(perl);
   
   #ifdef USE_ITHREADS
  -    if (s->is_virtual) {
  -        /* if alloc flags is On or clone flag is On,
  -         * virtual host gets its own mip
  -         */
  -        if (MpSrvPARENT(scfg) || MpSrvCLONE(scfg)) {
  -            modperl_interp_init(s, p, perl);
  -        }
  +    /* base server / virtual host w/ +Parent gets its own mip */
  +    modperl_interp_init(s, p, perl);
   
  -        /* if we allocated a parent perl, mark it to be destroyed */
  -        if (MpSrvPARENT(scfg)) {
  -            MpInterpBASE_On(scfg->mip->parent);
  -        }
  -    }
  -    else {
  -        /* base server */
  -        modperl_interp_init(s, p, perl);
  -        MpInterpBASE_On(scfg->mip->parent);
  -    }
  -    
  +    /* if we allocated a parent perl, mark it to be destroyed */
  +    MpInterpBASE_On(scfg->mip->parent);
   #endif
   
       PL_endav = endav;
  @@ -300,6 +286,11 @@
                      modperl_server_desc(s, p));
       }
       else {
  +        /* virtual host w/ +Clone gets its own mip */
  +        if (MpSrvCLONE(scfg)) {
  +            modperl_interp_init(s, p, perl);
  +        }   
  +        
           if (!modperl_config_apply_PerlModule(s, scfg, perl, p)) {
               return HTTP_INTERNAL_SERVER_ERROR;
           }
  
  
  

Mime
View raw message