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

[dougm]

dougm       00/09/26 13:07:36

  Modified:    src/modules/perl perl_config.c
  Log:
  fix bug in Perl{Set,Add}Var so $r->dir_config->get('key') sees the
  same values as $r->dir_config('key')
  
  Revision  Changes    Path
  1.103     +10 -8     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.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- perl_config.c     2000/09/22 18:52:00     1.102
  +++ perl_config.c     2000/09/26 20:05:22     1.103
  @@ -717,17 +717,18 @@
   
   CHAR_P perl_cmd_var(cmd_parms *cmd, void *config, char *key, char *val)
   {
  +    perl_dir_config *rec = (perl_dir_config *)config;
  +
       MP_TRACE_d(fprintf(stderr, "perl_cmd_var: '%s' = '%s'\n", key, val));
  -    if (cmd->path) {
  -        perl_dir_config *rec = (perl_dir_config *) config;
  -        if (cmd->info) {
  -            table_add(rec->vars, key, val);
  -        }
  -        else {
  -            table_set(rec->vars, key, val);
  -        }
  +
  +    if (cmd->info) {
  +        table_add(rec->vars, key, val);
       }
       else {
  +        table_set(rec->vars, key, val);
  +    }
  +
  +    if (cmd->path == NULL) {
           dPSRV(cmd->server);
           if (cmd->info) {
               table_add(cls->vars, key, val);
  @@ -736,6 +737,7 @@
               table_set(cls->vars, key, val);
           }
       }
  +
       return NULL;
   }