perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: modperl-2.0/src/modules/perl mod_perl.c modperl_callback.c modperl_config.c modperl_types.h modperl_util.h
Date Tue, 19 Aug 2003 05:01:23 GMT
randyk      2003/08/18 22:01:23

  Modified:    lib/ModPerl Code.pm
               src/modules/perl mod_perl.c modperl_callback.c
                        modperl_config.c modperl_types.h modperl_util.h
  Log:
  Reviewed by:	geoff, stas
  s/(RUN_ALL|RUN_FIRST|VOID)/MP_HOOK_$1/, as case-insensitive systems
  like Win32 get confused with use of VOID, thinking it's 'void'.
  
  Revision  Changes    Path
  1.102     +6 -6      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.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- Code.pm	11 Aug 2003 20:34:22 -0000	1.101
  +++ Code.pm	19 Aug 2003 05:01:22 -0000	1.102
  @@ -38,7 +38,7 @@
           ret  => 'void',
           args => [{type => 'apr_pool_t', name => 'p'},
                    {type => 'server_rec', name => 's'},
  -                 {type => 'dummy', name => 'VOID'}],
  +                 {type => 'dummy', name => 'MP_HOOK_VOID'}],
       },
       Files      => {
           ret  => 'int',
  @@ -46,23 +46,23 @@
                    {type => 'apr_pool_t', name => 'plog'},
                    {type => 'apr_pool_t', name => 'ptemp'},
                    {type => 'server_rec', name => 's'},
  -                 {type => 'dummy', name => 'RUN_ALL'}],
  +                 {type => 'dummy', name => 'MP_HOOK_RUN_ALL'}],
       },
       PerSrv     => {
           ret  => 'int',
           args => [{type => 'request_rec', name => 'r'}, 
  -                 {type => 'dummy', name => 'RUN_ALL'}],
  +                 {type => 'dummy', name => 'MP_HOOK_RUN_ALL'}],
       },
       Connection => {
           ret  => 'int',
           args => [{type => 'conn_rec', name => 'c'},
  -                 {type => 'dummy', name => 'RUN_FIRST'}],
  +                 {type => 'dummy', name => 'MP_HOOK_RUN_FIRST'}],
       },
       PreConnection => {
           ret  => 'int',
           args => [{type => 'conn_rec', name => 'c'},
                    {type => 'void', name => 'csd'},
  -                 {type => 'dummy', name => 'RUN_ALL'}],
  +                 {type => 'dummy', name => 'MP_HOOK_RUN_ALL'}],
       },
   );
   
  @@ -218,7 +218,7 @@
   
               if ($callback =~ m/modperl_callback_per_(dir|srv)/) {
                   if ($ix =~ m/AUTH|TYPE|TRANS/) {
  -                    $pass =~ s/RUN_ALL/RUN_FIRST/;
  +                    $pass =~ s/MP_HOOK_RUN_ALL/MP_HOOK_RUN_FIRST/;
                   }
               }
   
  
  
  
  1.178     +2 -2      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.177
  retrieving revision 1.178
  diff -u -r1.177 -r1.178
  --- mod_perl.c	11 Aug 2003 20:34:22 -0000	1.177
  +++ mod_perl.c	19 Aug 2003 05:01:22 -0000	1.178
  @@ -660,7 +660,7 @@
       char *level = NULL;
       server_rec *s = (server_rec *)data;
       
  -    modperl_callback_process(MP_CHILD_EXIT_HANDLER, server_pool, s, VOID);
  +    modperl_callback_process(MP_CHILD_EXIT_HANDLER, server_pool, s, MP_HOOK_VOID);
       
       if ((level = getenv("PERL_DESTRUCT_LEVEL"))) {
           modperl_destruct_level = atoi(level);
  @@ -849,7 +849,7 @@
   
       modperl_response_init(r);
   
  -    retval = modperl_callback_per_dir(MP_RESPONSE_HANDLER, r, RUN_FIRST);
  +    retval = modperl_callback_per_dir(MP_RESPONSE_HANDLER, r, MP_HOOK_RUN_FIRST);
   
       if ((retval == DECLINED) && r->content_type) {
           r->handler = r->content_type; /* let http_core or whatever try */
  
  
  
  1.56      +5 -5      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.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- modperl_callback.c	11 Aug 2003 20:34:22 -0000	1.55
  +++ modperl_callback.c	19 Aug 2003 05:01:22 -0000	1.56
  @@ -190,11 +190,11 @@
           MP_TRACE_h(MP_FUNC, "%s returned %d\n", handlers[i]->name, status);
   
           /* follow Apache's lead and let OK terminate the phase for
  -         * RUN_FIRST handlers.  RUN_ALL handlers keep going on OK.
  -         * VOID handler ignore all errors.
  +         * MP_HOOK_RUN_FIRST handlers.  MP_HOOK_RUN_ALL handlers keep going on OK.
  +         * MP_HOOK_VOID handler ignore all errors.
            */
   
  -        if (run_mode == RUN_ALL) {
  +        if (run_mode == MP_HOOK_RUN_ALL) {
               /* the normal case:
                *   OK and DECLINED continue 
                *   errors end the phase
  @@ -211,7 +211,7 @@
                   break;
               }
           }
  -        else if (run_mode == RUN_FIRST) {
  +        else if (run_mode == MP_HOOK_RUN_FIRST) {
               /* the exceptional case:
                *   OK and errors end the phase
                *   DECLINED continues
  @@ -239,7 +239,7 @@
           }
           else {
               /* the rare case.
  -             * VOID handlers completely ignore the return status
  +             * MP_HOOK_VOID handlers completely ignore the return status
                * Apache should handle whatever mod_perl returns, 
                * so there is no need to mess with the status
                */
  
  
  
  1.65      +1 -1      modperl-2.0/src/modules/perl/modperl_config.c
  
  Index: modperl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- modperl_config.c	11 Aug 2003 20:34:22 -0000	1.64
  +++ modperl_config.c	19 Aug 2003 05:01:22 -0000	1.65
  @@ -290,7 +290,7 @@
           rcfg->pnotes = Nullhv;
       }
   
  -    retval = modperl_callback_per_dir(MP_CLEANUP_HANDLER, r, RUN_ALL);
  +    retval = modperl_callback_per_dir(MP_CLEANUP_HANDLER, r, MP_HOOK_RUN_ALL);
       
       return retval;
   }
  
  
  
  1.69      +3 -3      modperl-2.0/src/modules/perl/modperl_types.h
  
  Index: modperl_types.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- modperl_types.h	11 Aug 2003 20:34:22 -0000	1.68
  +++ modperl_types.h	19 Aug 2003 05:01:22 -0000	1.69
  @@ -249,9 +249,9 @@
   } modperl_module_cmd_data_t;
   
   typedef enum {
  -    RUN_ALL,
  -    RUN_FIRST,
  -    VOID
  +    MP_HOOK_RUN_ALL,
  +    MP_HOOK_RUN_FIRST,
  +    MP_HOOK_VOID
   } modperl_hook_run_mode_e;
   
   #endif /* MODPERL_TYPES_H */
  
  
  
  1.44      +1 -1      modperl-2.0/src/modules/perl/modperl_util.h
  
  Index: modperl_util.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.h,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- modperl_util.h	11 Aug 2003 20:34:22 -0000	1.43
  +++ modperl_util.h	19 Aug 2003 05:01:22 -0000	1.44
  @@ -64,7 +64,7 @@
       }
   
   /* turn off cgi header parsing. in case we are already inside
  - *     modperl_callback_per_dir(MP_RESPONSE_HANDLER, r, RUN_FIRST); 
  + *     modperl_callback_per_dir(MP_RESPONSE_HANDLER, r, MP_HOOK_RUN_FIRST); 
    * but haven't sent any data yet, it's too late to change
    * MpReqPARSE_HEADERS, so change the wbucket's private flag directly
    */
  
  
  

Mime
View raw message