cvs commit: modperl-2.0/src/modules/perl modperl_config.c

[dougm]

dougm       01/11/18 16:33:37

  Modified:    src/modules/perl modperl_config.c
  Log:
  avoid get on the base table in modperl_table_overlap() since we already have the 
value
  
  Revision  Changes    Path
  1.50      +6 -5      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.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- modperl_config.c  2001/11/19 00:21:25     1.49
  +++ modperl_config.c  2001/11/19 00:33:37     1.50
  @@ -28,13 +28,14 @@
       apr_table_t *merge = apr_table_copy(p, add);
   
       for (i = 0; i < arr->nelts; i++) {
  -        char *val;
  -
  -        if ((val = (char *)apr_table_get(add, entries[i].key))) {
  +        if (apr_table_get(add, entries[i].key)) {
               continue;
           }
  -        else if ((val = (char *)apr_table_get(base, entries[i].key))){
  -            apr_table_set(merge, entries[i].key, val);
  +        else {
  +            /*XXX: should setn() be addn()for PerlSetVar?
  +             * since we have PerlAddVar, there may be multiple values.
  +             */
  +            apr_table_setn(merge, entries[i].key, entries[i].val);
           }
       }