dougm 01/07/09 20:30:30
Modified: src/modules/perl mod_perl.c mod_perl.h
. Changes
Log:
allow per-server and per-location PerlSetEnv to be properly merged
when a per-server handler is configured
Revision Changes Path
1.141 +8 -3 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mod_perl.c 2001/06/19 03:12:44 1.140
+++ mod_perl.c 2001/07/10 03:30:27 1.141
@@ -1388,6 +1388,14 @@
cfg->setup_env = 0; /* just once per-request */
}
+ if (cfg->dir_env != cld->env) {
+ /* PerlSetEnv
+ * update only if the table changes across a request
+ */
+ mod_perl_dir_env(r, cld);
+ cfg->dir_env = cld->env;
+ }
+
if(callbacks_this_request++ > 0) return;
if (!r->main) {
@@ -1397,9 +1405,6 @@
*/
(void)perl_request_rec(r);
}
-
- /* PerlSetEnv */
- mod_perl_dir_env(r, cld);
/* SetEnv PERL5LIB */
if (!MP_INCPUSH(cld)) {
1.110 +1 -0 modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_perl.h 2001/06/19 03:12:45 1.109
+++ mod_perl.h 2001/07/10 03:30:28 1.110
@@ -1064,6 +1064,7 @@
typedef struct {
HV *pnotes;
int setup_env;
+ table *dir_env;
array_header *sigsave;
} perl_request_config;
1.611 +4 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -r1.610 -r1.611
--- Changes 2001/07/09 15:03:07 1.610
+++ Changes 2001/07/10 03:30:29 1.611
@@ -10,6 +10,10 @@
=item 1.25_02-dev
+allow per-server and per-location PerlSetEnv to be properly merged
+when a per-server handler is configured, thanks to Michael Barry for
+the spot
+
enabled Apache::ModuleConfig on win32
[Randy Kobes <[EMAIL PROTECTED]>]
