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/27 21:55:47 UTC
cvs commit: modperl-2.0/src/modules/perl modperl_config.c modperl_env.c
dougm 01/09/27 12:55:47
Modified: src/modules/perl modperl_config.c modperl_env.c
Log:
properly support PerlOptions -SetupEnv
Revision Changes Path
1.38 +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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- modperl_config.c 2001/09/17 23:36:36 1.37
+++ modperl_config.c 2001/09/27 19:55:47 1.38
@@ -9,6 +9,8 @@
dcfg->interp_scope = MP_INTERP_SCOPE_UNDEF;
#endif
+ MpDirSETUP_ENV_On(dcfg); /* %ENV setup on by default */
+
return dcfg;
}
1.4 +7 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modperl_env.c 2001/06/27 05:35:55 1.3
+++ modperl_env.c 2001/09/27 19:55:47 1.4
@@ -44,6 +44,9 @@
apr_array_header_t *array = apr_table_elts(r->subprocess_env);
apr_table_entry_t *elts = (apr_table_entry_t *)array->elts;
+ ap_add_common_vars(r);
+ ap_add_cgi_vars(r);
+
modperl_env_untie(mg_flags);
for (i = 0; i < array->nelts; i++) {
@@ -101,11 +104,11 @@
void modperl_env_request_tie(pTHX_ request_rec *r)
{
- ap_add_common_vars(r);
- ap_add_cgi_vars(r);
+ MP_dDCFG;
- /* XXX: should be options #ifdef MP_PERL_HV_GMAGICAL_AWARE */
- mp_env_request_populate(aTHX_ r);
+ if (MpDirSETUP_ENV(dcfg)) {
+ mp_env_request_populate(aTHX_ r);
+ }
EnvMgObj = (char *)r;