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

[dougm]

dougm       01/03/25 13:26:48

  Modified:    src/modules/perl modperl_config.h modperl_mgv.c
  Log:
  need to PERL_SET_CONTEXT when resolving handlers for vhosts at startup time
  
  Revision  Changes    Path
  1.25      +3 -1      modperl-2.0/src/modules/perl/modperl_config.h
  
  Index: modperl_config.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- modperl_config.h  2001/03/17 06:03:37     1.24
  +++ modperl_config.h  2001/03/25 21:26:47     1.25
  @@ -52,7 +52,9 @@
      modperl_config_srv_t *scfg = modperl_config_srv_get(s)
   
   #ifdef USE_ITHREADS
  -#   define MP_dSCFG_dTHX dTHXa(scfg->mip->parent->perl)
  +#   define MP_dSCFG_dTHX \
  +    dTHXa(scfg->mip->parent->perl); \
  +    PERL_SET_CONTEXT(aTHX)
   #else
   #   define MP_dSCFG_dTHX dTHXa(scfg->perl)
   #endif
  
  
  
  1.10      +2 -2      modperl-2.0/src/modules/perl/modperl_mgv.c
  
  Index: modperl_mgv.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_mgv.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- modperl_mgv.c     2001/03/25 19:04:56     1.9
  +++ modperl_mgv.c     2001/03/25 21:26:47     1.10
  @@ -401,12 +401,12 @@
   static int modperl_hash_handlers_dir(apr_pool_t *p, server_rec *s,
                                        void *cfg, char *d, void *data)
   {
  +    int i;
  +    modperl_config_dir_t *dir_cfg = (modperl_config_dir_t *)cfg;
   #ifdef USE_ITHREADS
       MP_dSCFG(s);
       MP_dSCFG_dTHX;
   #endif
  -    int i;
  -    modperl_config_dir_t *dir_cfg = (modperl_config_dir_t *)cfg;
   
       if (!dir_cfg) {
           return 1;