geoff 2004/09/28 11:14:30
Modified: . Changes
src/modules/perl modperl_callback.c
t/response/TestDirective env.pm
t/response/TestModperl merge.pm
Log:
per-server PerlSetEnv and PerlPassEnv values are properly added
to %ENV when only a per-directory handler is configured.
Revision Changes Path
1.503 +4 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- Changes 28 Sep 2004 03:42:39 -0000 1.502
+++ Changes 28 Sep 2004 18:14:30 -0000 1.503
@@ -12,6 +12,10 @@
=item 1.99_17-dev
+per-server PerlSetEnv and PerlPassEnv values are properly added
+to %ENV when only a per-directory handler is configured.
+[Geoffrey Young]
+
resolve several 'Use of uninitialized value in...' warnings in
Apache::Status [Stas].
1.78 +5 -0 modperl-2.0/src/modules/perl/modperl_callback.c
Index: modperl_callback.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- modperl_callback.c 26 Sep 2004 03:12:38 -0000 1.77
+++ modperl_callback.c 28 Sep 2004 18:14:30 -0000 1.78
@@ -235,6 +235,11 @@
modperl_handler_make_args(aTHX_ &av_args,
"Apache::RequestRec", r, NULL);
+ /* per-server PerlSetEnv and PerlPassEnv - only once per-request */
+ if (! MpReqPERL_SET_ENV_SRV(rcfg)) {
+ modperl_env_configure_request_srv(aTHX_ r);
+ }
+
/* per-directory PerlSetEnv - only once per-request */
if (! MpReqPERL_SET_ENV_DIR(rcfg)) {
modperl_env_configure_request_dir(aTHX_ r);
1.7 +0 -3 modperl-2.0/t/response/TestDirective/env.pm
Index: env.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/env.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- env.pm 25 Sep 2004 19:30:07 -0000 1.6
+++ env.pm 28 Sep 2004 18:14:30 -0000 1.7
@@ -87,9 +87,6 @@
# per-server entry not overwritten
PerlSetEnv TestDirective__env_srv2 env_srv2
- # XXX: temp workaround
- PerlPostReadRequestHandler 'sub { use Apache::Const qw(DECLINED); DECLINED }'
-
# PerlPassEnv is only per-server
PerlPassEnv APACHE_TEST_HOSTNAME
</Base>
1.13 +0 -3 modperl-2.0/t/response/TestModperl/merge.pm
Index: merge.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/merge.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- merge.pm 25 Sep 2004 19:30:06 -0000 1.12
+++ merge.pm 28 Sep 2004 18:14:30 -0000 1.13
@@ -132,9 +132,6 @@
PerlModule TestModperl::merge
<VirtualHost TestModperl::merge>
- # XXX: temp workaround
- PerlPostReadRequestHandler 'sub { use Apache::Const qw(DECLINED); DECLINED
}'
-
# these should pass through all merges untouched
PerlPassEnv APACHE_TEST_HOSTTYPE
PerlSetEnv MergeSetEnv1 SetEnv1Val
