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

[dougm]

dougm       02/05/18 18:57:58

  Modified:    src/modules/perl modperl_cmd.c
  Log:
  fix $r->dir_config; per-dir values are *always* set,
  per-server is only set if parms->path == NULL
  
  Revision  Changes    Path
  1.18      +12 -10    modperl-2.0/src/modules/perl/modperl_cmd.c
  
  Index: modperl_cmd.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- modperl_cmd.c     13 May 2002 03:20:09 -0000      1.17
  +++ modperl_cmd.c     19 May 2002 01:57:58 -0000      1.18
  @@ -65,14 +65,15 @@
       MP_dSCFG(parms->server);
       modperl_config_dir_t *dcfg = (modperl_config_dir_t *)mconfig;
    
  -    if (parms->path) {
  -        apr_table_set(dcfg->SetVar, arg1, arg2);
  -        MP_TRACE_d(MP_FUNC, "DIR: arg1 = %s, arg2 = %s\n", arg1, arg2);
  -    }
  -    else {
  +    apr_table_set(dcfg->SetVar, arg1, arg2);
  +    MP_TRACE_d(MP_FUNC, "DIR: arg1 = %s, arg2 = %s\n", arg1, arg2);
  +
  +    /* make available via Apache->server->dir_config */
  +    if (!parms->path) {
           apr_table_set(scfg->SetVar, arg1, arg2);
           MP_TRACE_d(MP_FUNC, "SRV: arg1 = %s, arg2 = %s\n", arg1, arg2);
       }
  +
       return NULL;
   }
   
  @@ -81,14 +82,15 @@
       MP_dSCFG(parms->server);
       modperl_config_dir_t *dcfg = (modperl_config_dir_t *)mconfig;
    
  -    if (parms->path) {
  -        apr_table_add(dcfg->SetVar, arg1, arg2);
  -        MP_TRACE_d(MP_FUNC, "DIR: arg1 = %s, arg2 = %s\n", arg1, arg2);
  -    }
  -    else {
  +    apr_table_add(dcfg->SetVar, arg1, arg2);
  +    MP_TRACE_d(MP_FUNC, "DIR: arg1 = %s, arg2 = %s\n", arg1, arg2);
  +
  +    /* make available via Apache->server->dir_config */
  +    if (!parms->path) {
           apr_table_add(scfg->SetVar, arg1, arg2);
           MP_TRACE_d(MP_FUNC, "SRV: arg1 = %s, arg2 = %s\n", arg1, arg2);
       }
  +
       return NULL;
   }