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 Changes
Date Wed, 19 Feb 2003 02:38:22 GMT
stas        2003/02/18 18:38:22

  Modified:    src/modules/perl perl_config.c
               .        Changes
  Log:
  Make sure to start perl, if it's not running, before processing Perl*
  directives, with threaded perl and PERL_STACKED_HANDLERS=0
  
  Revision  Changes    Path
  1.115     +9 -5      modperl/src/modules/perl/perl_config.c
  
  Index: perl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- perl_config.c	24 Mar 2002 22:51:04 -0000	1.114
  +++ perl_config.c	19 Feb 2003 02:38:21 -0000	1.115
  @@ -437,6 +437,13 @@
   }
   #endif
   
  +#define STARTUP_PERL_IF_NOT_RUNNING \
  +if(!PERL_RUNNING()) { \
  +    perl_startup(parms->server, parms->pool); \
  +    require_Apache(parms->server); \
  +    MP_TRACE_g(fprintf(stderr, "mod_perl: calling perl_startup()\n")); \
  +}
  +
   #ifdef PERL_STACKED_HANDLERS
   
   CHAR_P perl_cmd_push_handlers(char *hook, PERL_CMD_TYPE **cmd, char *arg, pool *p)
  @@ -456,16 +463,13 @@
   }
   
   #define PERL_CMD_PUSH_HANDLERS(hook, cmd) \
  -if(!PERL_RUNNING()) { \
  -    perl_startup(parms->server, parms->pool); \
  -    require_Apache(parms->server); \
  -    MP_TRACE_g(fprintf(stderr, "mod_perl: calling perl_startup()\n")); \
  -} \
  +STARTUP_PERL_IF_NOT_RUNNING \
   return perl_cmd_push_handlers(hook,&cmd,arg,parms->pool)
   
   #else
   
   #define PERL_CMD_PUSH_HANDLERS(hook, cmd) \
  +STARTUP_PERL_IF_NOT_RUNNING \
   mp_preload_module(&arg); \
   cmd = arg; \
   return NULL
  
  
  
  1.661     +6 -2      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.660
  retrieving revision 1.661
  diff -u -r1.660 -r1.661
  --- Changes	28 Jan 2003 00:30:22 -0000	1.660
  +++ Changes	19 Feb 2003 02:38:21 -0000	1.661
  @@ -10,6 +10,10 @@
   
   =item 1.27_01-dev
   
  +Make sure to start perl, if it's not running, before processing Perl*
  +directives, with threaded perl and PERL_STACKED_HANDLERS=0 [Stas
  +Bekman]
  +
   Add Apache::Module to Bundle::Apache [Stas Bekman]
   
   use $Config{'installstyle'} instead of hardcoded 'lib', to handle
  @@ -19,8 +23,8 @@
   prevent segfaults in mod_perl_mark_where() when a sub can't get
   resolved [Gerald Richter <richter@ecos.de>]
   
  -Need to load B::Terse/TerseSize if it wasn't loaded yet in that child
  -before using it.  [Dan Sully <daniel@electricrain.com>]
  +Apache::Status: Need to load B::Terse/TerseSize if it wasn't loaded
  +yet in that child before using it.  [Dan Sully <daniel@electricrain.com>]
   
   document the server_root_relative() method [Stas Bekman <stas@stason.org>]
   
  
  
  

Mime
View raw message