You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@apache.org on 2001/09/28 01:31:36 UTC
cvs commit: modperl-2.0/src/modules/perl modperl_config.c modperl_env.c modperl_env.h modperl_options.c modperl_types.h
dougm 01/09/27 16:31:36
Modified: src/modules/perl modperl_config.c modperl_env.c
modperl_env.h modperl_options.c modperl_types.h
Log:
whoops. only meant to commit mod_perl.c, backing out half-way finish changes that should not have been committed
Revision Changes Path
1.40 +2 -0 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- modperl_config.c 2001/09/27 23:29:51 1.39
+++ modperl_config.c 2001/09/27 23:31:36 1.40
@@ -9,6 +9,8 @@
dcfg->interp_scope = MP_INTERP_SCOPE_UNDEF;
#endif
+ MpDirSETUP_ENV_On(dcfg); /* %ENV setup on by default */
+
return dcfg;
}
1.7 +2 -5 modperl-2.0/src/modules/perl/modperl_env.c
Index: modperl_env.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_env.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modperl_env.c 2001/09/27 23:29:51 1.6
+++ modperl_env.c 2001/09/27 23:31:36 1.7
@@ -36,7 +36,7 @@
{ NULL }
};
-void modperl_env_request_populate(pTHX_ request_rec *r)
+static void modperl_env_request_populate(pTHX_ request_rec *r)
{
HV *hv = GvHV(PL_envgv);
int i;
@@ -102,14 +102,11 @@
}
#endif
-#define MpDirSeenSETUP_ENV(dcfg) \
- (dcfg->flags->opts_seen & MpDir_f_SETUP_ENV)
-
void modperl_env_request_tie(pTHX_ request_rec *r)
{
MP_dDCFG;
- if (MpDirSETUP_ENV(dcfg) || !MpDirSeenSETUP_ENV(dcfg)) {
+ if (MpDirSETUP_ENV(dcfg)) {
modperl_env_request_populate(aTHX_ r);
}
1.3 +0 -3 modperl-2.0/src/modules/perl/modperl_env.h
Index: modperl_env.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_env.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modperl_env.h 2001/09/27 23:29:51 1.2
+++ modperl_env.h 2001/09/27 23:31:36 1.3
@@ -8,10 +8,7 @@
#define modperl_env_tie(mg_flags) \
SvFLAGS((SV*)GvHV(PL_envgv)) |= mg_flags
-void modperl_env_request_populate(pTHX_ request_rec *r);
-
void modperl_env_request_tie(pTHX_ request_rec *r);
-
void modperl_env_request_untie(pTHX_ request_rec *r);
#endif /* MODPERL_ENV_H */
1.9 +0 -4 modperl-2.0/src/modules/perl/modperl_options.c
Index: modperl_options.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_options.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- modperl_options.c 2001/09/27 23:29:51 1.8
+++ modperl_options.c 2001/09/27 23:31:36 1.9
@@ -82,8 +82,6 @@
}
#endif
- o->opts_seen |= opt;
-
if (action == '-') {
o->opts_remove |= opt;
o->opts_add &= ~opt;
@@ -127,8 +125,6 @@
conf->opts_add = add->opts_add;
conf->opts_remove = add->opts_remove;
}
-
- conf->opts_seen |= add->opts_seen;
return conf;
}
1.49 +0 -1 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- modperl_types.h 2001/09/27 23:29:51 1.48
+++ modperl_types.h 2001/09/27 23:31:36 1.49
@@ -98,7 +98,6 @@
modperl_opts_t opts_add;
modperl_opts_t opts_remove;
modperl_opts_t opts_override;
- modperl_opts_t opts_seen;
int unset;
} modperl_options_t;