perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@apache.org
Subject cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
Date Mon, 13 Sep 2004 22:36:19 GMT
gozer       2004/09/13 15:36:19

  Modified:    .        Changes
               t/response/TestAPI module.pm
               t/response/TestDirective cmdparms.pm perlloadmodule.pm
                        perlloadmodule2.pm perlloadmodule3.pm
                        perlloadmodule4.pm perlloadmodule5.pm
                        perlloadmodule6.pm
               xs/Apache/Module Apache__Module.h
               xs/maps  apache_functions.map
               xs/tables/current/ModPerl FunctionTable.pm
  Log:
  Apache::Module top_module() and get_config() changed from class
  methods to regular subroutines
  
  Revision  Changes    Path
  1.482     +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.481
  retrieving revision 1.482
  diff -u -r1.481 -r1.482
  --- Changes	9 Sep 2004 22:39:10 -0000	1.481
  +++ Changes	13 Sep 2004 22:36:18 -0000	1.482
  @@ -12,6 +12,9 @@
   
   =item 1.99_17-dev
   
  +Apache::Module top_module() and get_config() changed from class
  +methods to regular subroutines [Gozer]
  +
   Added Apache::CmdParms::add_config() to work around a memory
   leak discovered with <Perl> sections in .htaccess files [Gozer]
   
  
  
  
  1.22      +1 -1      modperl-2.0/t/response/TestAPI/module.pm
  
  Index: module.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/module.pm,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- module.pm	25 Aug 2004 21:47:19 -0000	1.21
  +++ module.pm	13 Sep 2004 22:36:18 -0000	1.22
  @@ -18,7 +18,7 @@
   
       my $cfg = Apache::Test::config();
   
  -    my $top_module = Apache::Module->top_module;
  +    my $top_module = Apache::Module::top_module();
   
       my $module_count = 0;
       for (my $modp = $top_module; $modp; $modp = $modp->next) {
  
  
  
  1.8       +1 -1      modperl-2.0/t/response/TestDirective/cmdparms.pm
  
  Index: cmdparms.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/cmdparms.pm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- cmdparms.pm	17 Aug 2004 23:40:41 -0000	1.7
  +++ cmdparms.pm	13 Sep 2004 22:36:19 -0000	1.8
  @@ -52,7 +52,7 @@
   
   sub get_config {
       my($self, $s) = (shift, shift);
  -    Apache::Module->get_config($self, $s, @_);
  +    Apache::Module::get_config($self, $s, @_);
   }
   
   ### response handler ###
  
  
  
  1.6       +1 -1      modperl-2.0/t/response/TestDirective/perlloadmodule.pm
  
  Index: perlloadmodule.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule.pm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- perlloadmodule.pm	9 Jul 2004 15:27:32 -0000	1.5
  +++ perlloadmodule.pm	13 Sep 2004 22:36:19 -0000	1.6
  @@ -90,7 +90,7 @@
   
   sub get_config {
       my($self, $s) = (shift, shift);
  -    Apache::Module->get_config($self, $s, @_);
  +    Apache::Module::get_config($self, $s, @_);
   }
   
   sub handler : method {
  
  
  
  1.7       +1 -1      modperl-2.0/t/response/TestDirective/perlloadmodule2.pm
  
  Index: perlloadmodule2.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule2.pm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- perlloadmodule2.pm	18 Apr 2003 06:18:58 -0000	1.6
  +++ perlloadmodule2.pm	13 Sep 2004 22:36:19 -0000	1.7
  @@ -70,7 +70,7 @@
   
   sub get_config {
       my($self, $s) = (shift, shift);
  -    Apache::Module->get_config($self, $s, @_);
  +    Apache::Module::get_config($self, $s, @_);
   }
   
   sub handler : method {
  
  
  
  1.5       +3 -3      modperl-2.0/t/response/TestDirective/perlloadmodule3.pm
  
  Index: perlloadmodule3.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule3.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- perlloadmodule3.pm	9 Jul 2004 08:01:21 -0000	1.4
  +++ perlloadmodule3.pm	13 Sep 2004 22:36:19 -0000	1.5
  @@ -35,7 +35,7 @@
       my($key, $self, $parms, $arg) = @_;
       $self->{$key} = $arg;
       unless ($parms->path) {
  -        my $srv_cfg = Apache::Module->get_config($self, $parms->server);
  +        my $srv_cfg = Apache::Module::get_config($self, $parms->server);
           $srv_cfg->{$key} = $arg;
       }
   }
  @@ -44,7 +44,7 @@
       my($key, $self, $parms, $arg) = @_;
       push @{ $self->{$key} }, $arg;
       unless ($parms->path) {
  -        my $srv_cfg = Apache::Module->get_config($self, $parms->server);
  +        my $srv_cfg = Apache::Module::get_config($self, $parms->server);
           push @{ $srv_cfg->{$key} }, $arg;
       }
   }
  @@ -87,7 +87,7 @@
   use Apache::Const -compile => qw(OK);
   
   sub get_config {
  -    Apache::Module->get_config(__PACKAGE__, @_);
  +    Apache::Module::get_config(__PACKAGE__, @_);
   }
   
   sub handler {
  
  
  
  1.8       +2 -2      modperl-2.0/t/response/TestDirective/perlloadmodule4.pm
  
  Index: perlloadmodule4.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule4.pm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- perlloadmodule4.pm	13 Aug 2004 05:27:11 -0000	1.7
  +++ perlloadmodule4.pm	13 Sep 2004 22:36:19 -0000	1.8
  @@ -33,7 +33,7 @@
       $self->{+KEY} = $arg;
       
       unless ($parms->path) {
  -        my $srv_cfg = Apache::Module->get_config($self, $parms->server);
  +        my $srv_cfg = Apache::Module::get_config($self, $parms->server);
           $srv_cfg->{+KEY} = $arg;
       }
   }
  @@ -51,7 +51,7 @@
   use Apache::Const -compile => qw(OK);
   
   sub get_config {
  -    Apache::Module->get_config(__PACKAGE__, @_);
  +    Apache::Module::get_config(__PACKAGE__, @_);
   }
   
   sub handler {
  
  
  
  1.7       +2 -2      modperl-2.0/t/response/TestDirective/perlloadmodule5.pm
  
  Index: perlloadmodule5.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule5.pm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- perlloadmodule5.pm	9 Jul 2004 15:27:32 -0000	1.6
  +++ perlloadmodule5.pm	13 Sep 2004 22:36:19 -0000	1.7
  @@ -30,7 +30,7 @@
       my($self, $parms, $arg) = @_;
       $self->{+KEY} = $arg;
       unless ($parms->path) {
  -        my $srv_cfg = Apache::Module->get_config($self, $parms->server);
  +        my $srv_cfg = Apache::Module::get_config($self, $parms->server);
           $srv_cfg->{+KEY} = $arg;
       }
   }
  @@ -48,7 +48,7 @@
   use Apache::Const -compile => qw(OK);
   
   sub get_config {
  -    Apache::Module->get_config(__PACKAGE__, @_);
  +    Apache::Module::get_config(__PACKAGE__, @_);
   }
   
   sub handler {
  
  
  
  1.6       +2 -2      modperl-2.0/t/response/TestDirective/perlloadmodule6.pm
  
  Index: perlloadmodule6.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule6.pm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- perlloadmodule6.pm	9 Jul 2004 15:27:32 -0000	1.5
  +++ perlloadmodule6.pm	13 Sep 2004 22:36:19 -0000	1.6
  @@ -20,7 +20,7 @@
       my($self, $parms, $arg) = @_;
       $self->{+KEY} = $arg;
       unless ($parms->path) {
  -        my $srv_cfg = Apache::Module->get_config($self, $parms->server);
  +        my $srv_cfg = Apache::Module::get_config($self, $parms->server);
           $srv_cfg->{+KEY} = $arg;
       }
   }
  @@ -38,7 +38,7 @@
   use Apache::Const -compile => qw(OK);
   
   sub get_config {
  -    Apache::Module->get_config(__PACKAGE__, @_);
  +    Apache::Module::get_config(__PACKAGE__, @_);
   }
   
   sub handler {
  
  
  
  1.13      +1 -3      modperl-2.0/xs/Apache/Module/Apache__Module.h
  
  Index: Apache__Module.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/Module/Apache__Module.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Apache__Module.h	4 Mar 2004 06:01:13 -0000	1.12
  +++ Apache__Module.h	13 Sep 2004 22:36:19 -0000	1.13
  @@ -13,8 +13,7 @@
    * limitations under the License.
    */
   
  -#define mpxs_Apache__Module_top_module(CLASS) \
  -(CLASS ? ap_top_module : ap_top_module)
  +#define mpxs_Apache__Module_top_module() ap_top_module
   
   static MP_INLINE int mpxs_Apache__Module_loaded(pTHX_ char *name)
   {
  @@ -54,7 +53,6 @@
   }
   
   static MP_INLINE SV *mpxs_Apache__Module_get_config(pTHX_
  -                                                    SV *self,
                                                       SV *pmodule,
                                                       server_rec *s,
                                                       ap_conf_vector_t *v)
  
  
  
  1.101     +2 -2      modperl-2.0/xs/maps/apache_functions.map
  
  Index: apache_functions.map
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- apache_functions.map	13 Sep 2004 21:35:40 -0000	1.100
  +++ apache_functions.map	13 Sep 2004 22:36:19 -0000	1.101
  @@ -198,7 +198,7 @@
    ap_log_pid
   
   MODULE=Apache::Module
  - module *:DEFINE_top_module | | SV *:CLASS
  + module *:DEFINE_top_module
   -ap_add_loaded_module
   -ap_add_module
   -ap_add_named_module
  @@ -213,7 +213,7 @@
   >ap_register_hooks
    mpxs_Apache__Module_loaded
    #ap_get_module_config
  - mpxs_Apache__Module_get_config | | self, pmodule, s, v=NULL
  + mpxs_Apache__Module_get_config | | pmodule, s, v=NULL
   
   MODULE=Apache::Directive
    ap_directive_t *:DEFINE_conftree | | SV *:CLASS
  
  
  
  1.180     +2 -6      modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
  
  Index: FunctionTable.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
  retrieving revision 1.179
  retrieving revision 1.180
  diff -u -r1.179 -r1.180
  --- FunctionTable.pm	9 Sep 2004 22:39:11 -0000	1.179
  +++ FunctionTable.pm	13 Sep 2004 22:36:19 -0000	1.180
  @@ -1,8 +1,8 @@
   package ModPerl::FunctionTable;
   
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  -# ! WARNING: generated by ModPerl::ParseSource/0.01
  -# !          Wed Sep  8 15:12:22 2004
  +# ! WARNING: generated by ModPerl::ParseSource/0.010
  +# !          Mon Sep 13 14:52:36 2004
   # !          do NOT edit, any changes will be lost !
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   
  @@ -6191,10 +6191,6 @@
         {
           'type' => 'PerlInterpreter *',
           'name' => 'my_perl'
  -      },
  -      {
  -        'type' => 'SV *',
  -        'name' => 'self'
         },
         {
           'type' => 'SV *',
  
  
  

Mime
View raw message