cvs commit: modperl-2.0/t/response/TestDirective loadmodule.pm

[dougm]

dougm       2002/09/04 10:11:22

  Modified:    src/modules/perl modperl_module.c
               t/response/TestDirective loadmodule.pm
  Log:
  support string values in req_override and args_how
  
  Revision  Changes    Path
  1.6       +14 -2     modperl-2.0/src/modules/perl/modperl_module.c
  
  Index: modperl_module.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_module.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- modperl_module.c  29 Aug 2002 04:32:50 -0000      1.5
  +++ modperl_module.c  4 Sep 2002 17:11:22 -0000       1.6
  @@ -593,7 +593,13 @@
               cmd->args_how = TAKE1; /* default */
           }
           else {
  -            cmd->args_how = SvIV(val);
  +            if (SvIOK(val)) {
  +                cmd->args_how = SvIV(val);
  +            }
  +            else {
  +                cmd->args_how =
  +                    modperl_constants_lookup_apache(SvPV(val, len));
  +            }
               SvREFCNT_dec(val);
           }
   
  @@ -615,7 +621,13 @@
               cmd->req_override = OR_ALL; /* default */
           }
           else {
  -            cmd->req_override = SvIV(val);
  +            if (SvIOK(val)) {
  +                cmd->req_override = SvIV(val);
  +            }
  +            else {
  +                cmd->req_override =
  +                    modperl_constants_lookup_apache(SvPV(val, len));
  +            }
               SvREFCNT_dec(val);
           }
   
  
  
  
  1.3       +2 -2      modperl-2.0/t/response/TestDirective/loadmodule.pm
  
  Index: loadmodule.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/loadmodule.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- loadmodule.pm     29 Aug 2002 04:16:27 -0000      1.2
  +++ loadmodule.pm     4 Sep 2002 17:11:22 -0000       1.3
  @@ -17,8 +17,8 @@
        func => __PACKAGE__ . '::MyTest',
        req_override => Apache::RSRC_CONF,
   #     req_override => 'RSRC_CONF', #test 1.x compat for strings
  -     args_how => Apache::TAKE23,
  -#     args_how => 'TAKE23', #test 1.x compat for strings
  +#     args_how => Apache::TAKE23,
  +     args_how => 'TAKE23', #test 1.x compat for strings
        errmsg => 'A test',
       },
       {