dougm 01/09/27 08:50:37 Modified: src/modules/perl modperl_cmd.c modperl_cmd.h t/response/TestModules cgi.pm Log: s/dummy/mconfig/g; s/on/flag_on/g Revision Changes Path 1.8 +5 -5 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- modperl_cmd.c 2001/09/27 15:46:21 1.7 +++ modperl_cmd.c 2001/09/27 15:50:37 1.8 @@ -63,7 +63,7 @@ MP_CMD_SRV_DECLARE(options) { MP_dSCFG(parms->server); - modperl_config_dir_t *dcfg = (modperl_config_dir_t *)dummy; + modperl_config_dir_t *dcfg = (modperl_config_dir_t *)mconfig; int is_per_dir = parms->path ? 1 : 0; modperl_options_t *opts = is_per_dir ? dcfg->flags : scfg->flags; apr_pool_t *p = parms->pool; @@ -89,8 +89,8 @@ MP_CMD_SRV_DECLARE_FLAG(taint_check) { - if (on) { - return modperl_cmd_switches(parms, dummy, "-T"); + if (flag_on) { + return modperl_cmd_switches(parms, mconfig, "-T"); } return NULL; @@ -117,7 +117,7 @@ MP_CMD_SRV_DECLARE(interp_scope) { modperl_interp_scope_e *scope; - modperl_config_dir_t *dcfg = (modperl_config_dir_t *)dummy; + modperl_config_dir_t *dcfg = (modperl_config_dir_t *)mconfig; MP_dSCFG(parms->server); int is_per_dir = parms->path ? 1 : 0; @@ -154,7 +154,7 @@ #define MP_CMD_INTERP_POOL_IMP(xitem) \ const char *modperl_cmd_interp_##xitem(cmd_parms *parms, \ - void *dummy, const char *arg) \ + void *mconfig, const char *arg) \ { \ MP_dSCFG(parms->server); \ int item = atoi(arg); \ 1.10 +3 -3 modperl-2.0/src/modules/perl/modperl_cmd.h Index: modperl_cmd.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- modperl_cmd.h 2001/09/27 15:46:21 1.9 +++ modperl_cmd.h 2001/09/27 15:50:37 1.10 @@ -7,15 +7,15 @@ #define MP_CMD_SRV_DECLARE(item) \ const char *modperl_cmd_##item(cmd_parms *parms, \ - void *dummy, const char *arg) + void *mconfig, const char *arg) #define MP_CMD_SRV_DECLARE2(item) \ const char *modperl_cmd_##item(cmd_parms *parms, \ - void *dummy, const char *arg1, const char *arg2) + void *mconfig, const char *arg1, const char *arg2) #define MP_CMD_SRV_DECLARE_FLAG(item) \ const char *modperl_cmd_##item(cmd_parms *parms, \ - void *dummy, int on) + void *mconfig, int flag_on) MP_CMD_SRV_DECLARE(trace); MP_CMD_SRV_DECLARE(switches); 1.6 +2 -0 modperl-2.0/t/response/TestModules/cgi.pm Index: cgi.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/response/TestModules/cgi.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cgi.pm 2001/06/27 05:36:52 1.5 +++ cgi.pm 2001/09/27 15:50:37 1.6 @@ -9,6 +9,8 @@ sub handler { my $r = shift; + system "echo hi"; + if ($CGI::Q) { die "CGI.pm globals were not reset"; }