dougm 02/05/18 19:10:13
Modified: src/modules/perl modperl_cmd.c modperl_config.c
modperl_types.h modperl_util.c
Log:
not sure why the 1.x [sd]cfg->vars name was renamed to SetVar, but it
shouldn't have been.
Revision Changes Path
1.19 +4 -4 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- modperl_cmd.c 19 May 2002 01:57:58 -0000 1.18
+++ modperl_cmd.c 19 May 2002 02:10:13 -0000 1.19
@@ -65,12 +65,12 @@
MP_dSCFG(parms->server);
modperl_config_dir_t *dcfg = (modperl_config_dir_t *)mconfig;
- apr_table_set(dcfg->SetVar, arg1, arg2);
+ apr_table_set(dcfg->vars, 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);
+ apr_table_set(scfg->vars, arg1, arg2);
MP_TRACE_d(MP_FUNC, "SRV: arg1 = %s, arg2 = %s\n", arg1, arg2);
}
@@ -82,12 +82,12 @@
MP_dSCFG(parms->server);
modperl_config_dir_t *dcfg = (modperl_config_dir_t *)mconfig;
- apr_table_add(dcfg->SetVar, arg1, arg2);
+ apr_table_add(dcfg->vars, 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);
+ apr_table_add(scfg->vars, arg1, arg2);
MP_TRACE_d(MP_FUNC, "SRV: arg1 = %s, arg2 = %s\n", arg1, arg2);
}
1.54 +4 -4 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- modperl_config.c 12 May 2002 23:01:32 -0000 1.53
+++ modperl_config.c 19 May 2002 02:10:13 -0000 1.54
@@ -71,7 +71,7 @@
merge_item(location);
- merge_table_overlap_item(SetVar);
+ merge_table_overlap_item(vars);
merge_table_overlap_item(SetEnv);
@@ -107,7 +107,7 @@
scfg->argv = apr_array_make(p, 2, sizeof(char *));
- scfg->SetVar = apr_table_make(p, 2);
+ scfg->vars = apr_table_make(p, 2);
scfg->PassEnv = apr_table_make(p, 2);
scfg->SetEnv = apr_table_make(p, 2);
@@ -126,7 +126,7 @@
dcfg->flags = modperl_options_new(p, MpDirType);
- dcfg->SetVar = apr_table_make(p, 2);
+ dcfg->vars = apr_table_make(p, 2);
dcfg->SetEnv = apr_table_make(p, 2);
@@ -198,7 +198,7 @@
merge_item(PerlModule);
merge_item(PerlRequire);
- merge_table_overlap_item(SetVar);
+ merge_table_overlap_item(vars);
merge_table_overlap_item(SetEnv);
merge_table_overlap_item(PassEnv);
1.57 +2 -2 modperl-2.0/src/modules/perl/modperl_types.h
Index: modperl_types.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- modperl_types.h 21 Feb 2002 01:45:34 -0000 1.56
+++ modperl_types.h 19 May 2002 02:10:13 -0000 1.57
@@ -112,7 +112,7 @@
} modperl_interp_scope_e;
typedef struct {
- MpHV *SetVar;
+ MpHV *vars;
MpHV *SetEnv;
MpHV *PassEnv;
MpAV *PerlRequire, *PerlModule;
@@ -141,7 +141,7 @@
char *PerlDispatchHandler;
MpAV *handlers_per_dir[MP_HANDLER_NUM_PER_DIR];
MpHV *SetEnv;
- MpHV *SetVar;
+ MpHV *vars;
modperl_options_t *flags;
#ifdef USE_ITHREADS
modperl_interp_scope_e interp_scope;
1.41 +2 -2 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- modperl_util.c 13 May 2002 03:17:54 -0000 1.40
+++ modperl_util.c 19 May 2002 02:10:13 -0000 1.41
@@ -536,7 +536,7 @@
if (r && r->per_dir_config) {
MP_dDCFG;
- retval = modperl_table_get_set(aTHX_ dcfg->SetVar,
+ retval = modperl_table_get_set(aTHX_ dcfg->vars,
key, sv_val, FALSE);
}
@@ -544,7 +544,7 @@
if (s && s->module_config) {
MP_dSCFG(s);
SvREFCNT_dec(retval); /* in case above did newSV(0) */
- retval = modperl_table_get_set(aTHX_ scfg->SetVar,
+ retval = modperl_table_get_set(aTHX_ scfg->vars,
key, sv_val, FALSE);
}
else {
