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

2001-10-11 Thread dougm 

dougm   01/10/11 08:38:23

  Modified:src/modules/perl modperl_config.h
  Log:
  add MP_dTHX macro
  
  Revision  ChangesPath
  1.28  +10 -0 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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- modperl_config.h  2001/08/08 16:20:31 1.27
  +++ modperl_config.h  2001/10/11 15:38:23 1.28
  @@ -59,6 +59,16 @@
   #   define MP_dSCFG_dTHX dTHXa(scfg->perl)
   #endif
   
  +/* hopefully this macro will not need to be used often */
  +#ifdef USE_ITHREADS
  +#   define MP_dTHX \
  +modperl_interp_t *interp = \
  +   modperl_interp_select(r, r->connection, r->server); \
  +dTHXa(interp->perl)
  +#else
  +#   define MP_dTHX dNOOP
  +#endif
  +
   int modperl_config_apply_PerlModule(server_rec *s,
   modperl_config_srv_t *scfg,
   PerlInterpreter *perl, apr_pool_t *p);

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

2001-03-25 Thread 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  ChangesPath
  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;

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

2001-03-15 Thread dougm 

dougm   01/03/15 22:35:18

  Modified:src/modules/perl modperl_config.h
  Log:
  allow modperl_config_req_get() to not core-dump if r == NULL
  
  Revision  ChangesPath
  1.23  +2 -2  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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- modperl_config.h  2001/03/16 05:52:29 1.22
  +++ modperl_config.h  2001/03/16 06:35:18 1.23
  @@ -27,8 +27,8 @@
   }
   
   #define modperl_config_req_get(r) \
  - (modperl_config_req_t *) \
  -  ap_get_module_config(r->request_config, &perl_module)
  + (r ? (modperl_config_req_t *) \
  +  ap_get_module_config(r->request_config, &perl_module) : NULL)
   
   #define MP_dRCFG \
  modperl_config_req_t *rcfg = modperl_config_req_get(r)

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

2001-01-21 Thread dougm 

dougm   01/01/21 13:04:53

  Modified:src/modules/perl modperl_config.h
  Log:
  add modperl_{srv,dir}_config_get
  
  Revision  ChangesPath
  1.16  +9 -5  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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- modperl_config.h  2001/01/02 06:40:19 1.15
  +++ modperl_config.h  2001/01/21 21:04:52 1.16
  @@ -56,14 +56,18 @@
   #define MP_dRCFG \
  modperl_request_config_t *rcfg = modperl_request_config_get(r)
   
  -#define MP_dDCFG \
  -   modperl_dir_config_t *dcfg = \
  +#define modperl_dir_config_get(r) \
 (r ? (modperl_dir_config_t *) \
 ap_get_module_config(r->per_dir_config, &perl_module) : NULL)
   
  -#define MP_dSCFG(s) \
  -   modperl_srv_config_t *scfg = \
  -  (modperl_srv_config_t *) \
  +#define MP_dDCFG \
  +   modperl_dir_config_t *dcfg = modperl_dir_config_get(r)
  +
  +#define modperl_srv_config_get(s) \
  + (modperl_srv_config_t *) \
 ap_get_module_config(s->module_config, &perl_module)
  +
  +#define MP_dSCFG(s) \
  +   modperl_srv_config_t *scfg = modperl_srv_config_get(s)
   
   #endif /* MODPERL_CONFIG_H */

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

2000-06-18 Thread dougm 

dougm   00/06/18 20:03:34

  Modified:lib/ModPerl Code.pm
   src/modules/perl modperl_config.h
  Log:
  use new AP_INIT_* macros
  
  Revision  ChangesPath
  1.31  +2 -2  modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Code.pm   2000/06/13 21:05:35 1.30
  +++ Code.pm   2000/06/19 03:03:32 1.31
  @@ -218,8 +218,8 @@
   print $h_fh <{scope}, ITERATE, "Subroutine name"}
  +AP_INIT_ITERATE("$h_name", $name, NULL, \\
  + $prototype->{scope}, "Subroutine name")
   
   EOF
   print $c_fh <