perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/src/modules/perl mod_perl.c mod_perl.h modperl_callback.c modperl_callback.h
Date Sat, 24 Nov 2001 01:15:02 GMT
dougm       01/11/23 17:15:02

  Modified:    lib/ModPerl Code.pm
               src/modules/perl mod_perl.c mod_perl.h modperl_callback.c
                        modperl_callback.h
  Log:
  adjust to open_logs and post_config hook prototype changes
  
  Revision  Changes    Path
  1.72      +1 -1      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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Code.pm	2001/11/05 05:19:01	1.71
  +++ Code.pm	2001/11/24 01:15:01	1.72
  @@ -33,7 +33,7 @@
                    {type => 'server_rec', name => 's'}],
       },
       Files      => {
  -        ret  => 'void',
  +        ret  => 'int',
           args => [{type => 'apr_pool_t', name => 'pconf'},
                    {type => 'apr_pool_t', name => 'plog'},
                    {type => 'apr_pool_t', name => 'ptemp'},
  
  
  
  1.97      +8 -4      modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- mod_perl.c	2001/11/19 00:07:28	1.96
  +++ mod_perl.c	2001/11/24 01:15:01	1.97
  @@ -315,14 +315,16 @@
       return APR_SUCCESS;
   }
   
  -void modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog, 
  -                       apr_pool_t *ptemp, server_rec *s)
  +int modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog, 
  +                      apr_pool_t *ptemp, server_rec *s)
   {
       modperl_sys_init();
       apr_pool_cleanup_register(pconf, NULL,
                                 modperl_sys_term, apr_pool_cleanup_null);
       modperl_init_globals(s, pconf);
       modperl_init(s, pconf);
  +
  +    return OK;
   }
   
   void modperl_pre_config_handler(apr_pool_t *p, apr_pool_t *plog,
  @@ -340,8 +342,8 @@
       return OK;
   }
   
  -static void modperl_hook_post_config(apr_pool_t *pconf, apr_pool_t *plog,
  -                                     apr_pool_t *ptemp, server_rec *s)
  +static int modperl_hook_post_config(apr_pool_t *pconf, apr_pool_t *plog,
  +                                    apr_pool_t *ptemp, server_rec *s)
   {
   #ifdef USE_ITHREADS
       MP_dSCFG(s);
  @@ -356,6 +358,8 @@
   #ifdef USE_ITHREADS
       modperl_init_clones(s, pconf);
   #endif
  +
  +    return OK;
   }
   
   static int modperl_hook_create_request(request_rec *r)
  
  
  
  1.39      +2 -2      modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_perl.h	2001/09/27 19:04:38	1.38
  +++ mod_perl.h	2001/11/24 01:15:01	1.39
  @@ -40,8 +40,8 @@
   #include "modperl_perl.h"
   
   void modperl_init(server_rec *s, apr_pool_t *p);
  -void modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog, 
  -                       apr_pool_t *ptemp, server_rec *s);
  +int modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog, 
  +                      apr_pool_t *ptemp, server_rec *s);
   void modperl_pre_config_handler(apr_pool_t *p, apr_pool_t *plog,
                                   apr_pool_t *ptemp);
   void modperl_register_hooks(apr_pool_t *p);
  
  
  
  1.47      +6 -6      modperl-2.0/src/modules/perl/modperl_callback.c
  
  Index: modperl_callback.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- modperl_callback.c	2001/11/05 05:19:01	1.46
  +++ modperl_callback.c	2001/11/24 01:15:01	1.47
  @@ -224,11 +224,11 @@
                                     p, NULL, NULL);
   }
   
  -void modperl_callback_files(int idx,
  -                            apr_pool_t *pconf, apr_pool_t *plog,
  -                            apr_pool_t *ptemp, server_rec *s)
  +int modperl_callback_files(int idx,
  +                           apr_pool_t *pconf, apr_pool_t *plog,
  +                           apr_pool_t *ptemp, server_rec *s)
   {
  -    modperl_callback_run_handlers(idx, MP_HANDLER_TYPE_FILES,
  -                                  NULL, NULL, s,
  -                                  pconf, plog, ptemp);
  +    return modperl_callback_run_handlers(idx, MP_HANDLER_TYPE_FILES,
  +                                         NULL, NULL, s,
  +                                         pconf, plog, ptemp);
   }
  
  
  
  1.20      +3 -3      modperl-2.0/src/modules/perl/modperl_callback.h
  
  Index: modperl_callback.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- modperl_callback.h	2001/10/06 21:05:40	1.19
  +++ modperl_callback.h	2001/11/24 01:15:01	1.20
  @@ -27,8 +27,8 @@
   
   void modperl_callback_process(int idx, apr_pool_t *p, server_rec *s);
   
  -void modperl_callback_files(int idx,
  -                            apr_pool_t *pconf, apr_pool_t *plog,
  -                            apr_pool_t *ptemp, server_rec *s);
  +int modperl_callback_files(int idx,
  +                           apr_pool_t *pconf, apr_pool_t *plog,
  +                           apr_pool_t *ptemp, server_rec *s);
   
   #endif /* MODPERL_CALLBACK_H */
  
  
  

Mime
View raw message