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

[stas]

stas        2003/10/22 18:10:55

  Modified:    src/modules/perl mod_perl.c
  Log:
  don't try to set base perl flag on a non-existing mip
  
  Revision  Changes    Path
  1.197     +6 -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.196
  retrieving revision 1.197
  diff -u -u -r1.196 -r1.197
  --- mod_perl.c        23 Oct 2003 01:09:21 -0000      1.196
  +++ mod_perl.c        23 Oct 2003 01:10:55 -0000      1.197
  @@ -414,12 +414,13 @@
       }
   
   #ifdef USE_ITHREADS
  -    /* if we allocated a parent perl, mark it to be destroyed */
  -    if (MpSrvPARENT(scfg)) {
  -        MpInterpBASE_On(scfg->mip->parent);
  +    if (scfg->mip) {
  +        /* if we allocated a parent perl, mark it to be destroyed */
  +        if (MpSrvPARENT(scfg)) {
  +            MpInterpBASE_On(scfg->mip->parent);
  +        }
       }
  -    
  -    if (!scfg->mip) {
  +    else {
           /* since mips are created after merge_server_configs()
            * need to point to the base mip here if this vhost
            * doesn't have its own