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

[dougm]

dougm       01/09/15 13:17:35

  Modified:    src/modules/perl modperl_config.c
  Log:
  only inherit base PerlSwitches if explicitly told to with "PerlSwitches +inherit"
  
  Revision  Changes    Path
  1.36      +9 -2      modperl-2.0/src/modules/perl/modperl_config.c
  
  Index: modperl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- modperl_config.c  2001/08/10 23:37:33     1.35
  +++ modperl_config.c  2001/09/15 20:17:35     1.36
  @@ -168,8 +168,15 @@
       merge_item(perl);
   #endif
   
  -    /* argv always initialized to 1 with ap_server_argv0 */
  -    mrg->argv = add->argv->nelts > 1 ? add->argv : base->argv;
  +    if (add->argv->nelts == 2 &&
  +        strEQ(((char **)add->argv->elts)[1], "+inherit"))
  +    {
  +        /* only inherit base PerlSwitches if explicitly told to */
  +        mrg->argv = base->argv;
  +    }
  +    else {
  +        mrg->argv = add->argv;
  +    }
   
       mrg->flags = modperl_options_merge(p, base->flags, add->flags);