cvs commit: apache-2.0/mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c

[manoj]

manoj       99/07/27 16:54:26

  Modified:    mpm/src/modules/mpm/dexter dexter.c
               mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
  Log:
  Update with latest hook additions.
  
  Revision  Changes    Path
  1.10      +6 -7      apache-2.0/mpm/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -d -u -r1.9 -r1.10
  --- dexter.c  1999/07/27 12:05:02     1.9
  +++ dexter.c  1999/07/27 23:54:16     1.10
  @@ -1443,12 +1443,6 @@
       return 0;
   }
   
  -static void dexter_hooks(void)
  -{
  -    INIT_SIGLIST()
  -    one_process = 0;
  -}
  -
   static void dexter_pre_config(pool *pconf, pool *plog, pool *ptemp)
   {
       static int restart_num = 0;
  @@ -1480,6 +1474,12 @@
       ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   }
   
  +static void dexter_hooks(void)
  +{
  +    ap_hook_pre_config(dexter_pre_config, NULL, NULL, HOOK_MIDDLE);
  +    INIT_SIGLIST()
  +    one_process = 0;
  +}
   
   static const char *set_pidfile(cmd_parms *cmd, void *dummy, char *arg) 
   {
  @@ -1691,7 +1691,6 @@
   
   module MODULE_VAR_EXPORT mpm_dexter_module = {
       STANDARD20_MODULE_STUFF,
  -    dexter_pre_config,               /* pre_config */
       NULL,                       /* post_config */
       NULL,                    /* open_logs */
       NULL,                    /* child_init */
  
  
  
  1.14      +7 -7      
apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: 
/home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -d -u -r1.13 -r1.14
  --- mpmt_pthread.c    1999/07/27 12:05:03     1.13
  +++ mpmt_pthread.c    1999/07/27 23:54:24     1.14
  @@ -1510,12 +1510,6 @@
       return 0;
   }
   
  -static void mpmt_pthread_hooks(void)
  -{
  -    INIT_SIGLIST()
  -    one_process = 0;
  -}
  -
   static void mpmt_pthread_pre_config(pool *pconf, pool *plog, pool *ptemp)
   {
       static int restart_num = 0;
  @@ -1549,6 +1543,13 @@
       ap_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir));
   }
   
  +static void mpmt_pthread_hooks(void)
  +{
  +    ap_hook_pre_config(mpmt_pthread_pre_config,NULL,NULL,HOOK_MIDDLE);
  +    INIT_SIGLIST()
  +    one_process = 0;
  +}
  +
   
   static const char *set_pidfile(cmd_parms *cmd, void *dummy, char *arg) 
   {
  @@ -1764,7 +1765,6 @@
   
   module MODULE_VAR_EXPORT mpm_mpmt_pthread_module = {
       STANDARD20_MODULE_STUFF,
  -    mpmt_pthread_pre_config,         /* pre_config */
       NULL,                       /* post_config */
       NULL,                    /* open_logs */
       NULL,                    /* child_init */