cvs commit: modperl/src/modules/perl mod_perl.c perl_config.c

[dougm]

dougm       00/05/12 18:10:54

  Modified:    .        Changes
               src/modules/perl mod_perl.c perl_config.c
  Log:
  add PerlAddVar directive, like PerlSetVar, but uses ap_table_add
  instead of ap_table_set
  
  Revision  Changes    Path
  1.482     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.481
  retrieving revision 1.482
  diff -u -r1.481 -r1.482
  --- Changes   2000/05/12 22:48:06     1.481
  +++ Changes   2000/05/13 01:10:52     1.482
  @@ -10,6 +10,9 @@
   
   =item 1.23_01-dev
   
  +add PerlAddVar directive, like PerlSetVar, but uses ap_table_add
  +instead of ap_table_set
  +
   Makefile.PL warns about 5.6.0+uselargefiles if USE_APXS
   
   Apache::Table->unset can now be called with an array reference
  
  
  
  1.117     +3 -0      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- mod_perl.c        2000/04/13 06:07:33     1.116
  +++ mod_perl.c        2000/05/13 01:10:53     1.117
  @@ -126,6 +126,9 @@
       { "PerlSetVar", (crft) perl_cmd_var,
         NULL,
         OR_ALL, TAKE2, "Perl config var and value" },
  +    { "PerlAddVar", (crft) perl_cmd_var,
  +      (void*)1,
  +      OR_ALL, TAKE2, "Perl config var and value" },
       { "PerlSetEnv", (crft) perl_cmd_setenv,
         NULL,
         OR_ALL, TAKE2, "Perl %ENV key and value" },
  
  
  
  1.97      +12 -2     modperl/src/modules/perl/perl_config.c
  
  Index: perl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- perl_config.c     2000/05/13 00:57:21     1.96
  +++ perl_config.c     2000/05/13 01:10:53     1.97
  @@ -729,11 +729,21 @@
       MP_TRACE_d(fprintf(stderr, "perl_cmd_var: '%s' = '%s'\n", key, val));
       if (cmd->path) {
           perl_dir_config *rec = (perl_dir_config *) config;
  -        table_set(rec->vars, key, val);
  +        if (cmd->info) {
  +            table_add(rec->vars, key, val);
  +        }
  +        else {
  +            table_set(rec->vars, key, val);
  +        }
       }
       else {
           dPSRV(cmd->server);
  -        table_set(cls->vars, key, val);
  +        if (cmd->info) {
  +            table_add(cls->vars, key, val);
  +        }
  +        else {
  +            table_set(cls->vars, key, val);
  +        }
       }
       return NULL;
   }