perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: modperl-2.0/src/modules/perl modperl_config.c mod_perl.c mod_perl.h modperl_config.h
Date Sat, 15 Apr 2000 23:00:48 GMT
dougm       00/04/15 16:00:47

  Modified:    lib/ModPerl Code.pm
               src/modules/perl mod_perl.c mod_perl.h modperl_config.h
  Added:       src/modules/perl modperl_config.c
  Log:
  put modperl_config.c in place
  
  Revision  Changes    Path
  1.7       +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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Code.pm	2000/04/15 17:51:44	1.6
  +++ Code.pm	2000/04/15 23:00:45	1.7
  @@ -272,7 +272,7 @@
      generate_trace              => {h => 'modperl_trace.h'},
   );
   
  -my @c_src_names = qw(interp log);
  +my @c_src_names = qw(interp log config);
   my @g_c_names = map { "modperl_$_" } qw(hooks directives);
   my @c_names   = ('mod_perl', (map "modperl_$_", @c_src_names), @g_c_names);
   sub c_files { map { "$_.c" } @c_names }
  
  
  
  1.4       +0 -35     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_perl.c	2000/04/15 01:38:45	1.3
  +++ mod_perl.c	2000/04/15 23:00:46	1.4
  @@ -38,41 +38,6 @@
   {
   }
   
  -void *modperl_create_dir_config(ap_pool_t *p, char *dir)
  -{
  -    return NULL;
  -}
  -
  -void *modperl_merge_dir_config(ap_pool_t *p, void *base, void *add)
  -{
  -    return NULL;
  -}
  -
  -modperl_srv_config_t *modperl_srv_config_new(ap_pool_t *p)
  -{
  -    return (modperl_srv_config_t *)
  -        ap_pcalloc(p, sizeof(modperl_srv_config_t));
  -}
  -
  -void *modperl_create_srv_config(ap_pool_t *p, server_rec *s)
  -{
  -    modperl_srv_config_t *scfg = modperl_srv_config_new(p);
  -
  -    return scfg;
  -}
  -
  -void *modperl_merge_srv_config(ap_pool_t *p, void *basev, void *addv)
  -{
  -    modperl_srv_config_t
  -        *base = (modperl_srv_config_t *)basev,
  -        *add  = (modperl_srv_config_t *)addv,
  -        *mrg  = modperl_srv_config_new(p);
  -
  -    mrg->mip = add->mip ? add->mip : base->mip;
  -
  -    return mrg;
  -}
  -
   void modperl_register_hooks(void)
   {
       /* XXX: should be pre_config hook or 1.xx logic */
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_perl.h	2000/04/15 01:38:45	1.3
  +++ mod_perl.h	2000/04/15 23:00:46	1.4
  @@ -19,7 +19,7 @@
   
   #include "apr_lock.h"
   
  -module MODULE_VAR_EXPORT perl_module;
  +extern module MODULE_VAR_EXPORT perl_module;
   
   #include "modperl_flags.h"
   #include "modperl_hooks.h"
  
  
  
  1.3       +10 -0     modperl-2.0/src/modules/perl/modperl_config.h
  
  Index: modperl_config.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- modperl_config.h	2000/04/14 23:52:54	1.2
  +++ modperl_config.h	2000/04/15 23:00:47	1.3
  @@ -1,6 +1,16 @@
   #ifndef MODPERL_CONFIG_H
   #define MODPERL_CONFIG_H
   
  +void *modperl_create_dir_config(ap_pool_t *p, char *dir);
  +
  +void *modperl_merge_dir_config(ap_pool_t *p, void *base, void *add);
  +
  +modperl_srv_config_t *modperl_srv_config_new(ap_pool_t *p);
  +
  +void *modperl_create_srv_config(ap_pool_t *p, server_rec *s);
  +
  +void *modperl_merge_srv_config(ap_pool_t *p, void *basev, void *addv);
  +
   char *modperl_cmd_push_handlers(MpAV *handlers, char *name, ap_pool_t *p);
   
   #define MP_dRCFG \
  
  
  
  1.1                  modperl-2.0/src/modules/perl/modperl_config.c
  
  Index: modperl_config.c
  ===================================================================
  #include "mod_perl.h"
  
  void *modperl_create_dir_config(ap_pool_t *p, char *dir)
  {
      return NULL;
  }
  
  void *modperl_merge_dir_config(ap_pool_t *p, void *base, void *add)
  {
      return NULL;
  }
  
  modperl_srv_config_t *modperl_srv_config_new(ap_pool_t *p)
  {
      return (modperl_srv_config_t *)
          ap_pcalloc(p, sizeof(modperl_srv_config_t));
  }
  
  void *modperl_create_srv_config(ap_pool_t *p, server_rec *s)
  {
      modperl_srv_config_t *scfg = modperl_srv_config_new(p);
  
      return scfg;
  }
  
  void *modperl_merge_srv_config(ap_pool_t *p, void *basev, void *addv)
  {
      modperl_srv_config_t
          *base = (modperl_srv_config_t *)basev,
          *add  = (modperl_srv_config_t *)addv,
          *mrg  = modperl_srv_config_new(p);
  
      mrg->mip = add->mip ? add->mip : base->mip;
  
      return mrg;
  }
  
  
  

Mime
View raw message