dougm 01/07/10 20:02:29
Modified: src/modules/perl perl_config.c
. Changes
Log:
Apache->server will now point the current VirtualHost when inside a
<Perl> section
Revision Changes Path
1.111 +9 -1 modperl/src/modules/perl/perl_config.c
Index: perl_config.c
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- perl_config.c 2001/06/19 03:12:45 1.110
+++ perl_config.c 2001/07/11 03:02:26 1.111
@@ -1744,7 +1744,15 @@
ENTER_SAFE(parms->server, parms->pool);
MP_TRACE_g(mod_perl_dump_opmask());
- perl_eval_sv(code, G_DISCARD);
+
+ {
+ SV *server_sv = perl_get_sv("Apache::__SERVER", FALSE);
+ IV ptr = SvIVX(SvRV(server_sv));
+ SvIVX(SvRV(server_sv)) = (IV)parms->server;
+ perl_eval_sv(code, G_DISCARD);
+ SvIVX(SvRV(server_sv)) = (IV)ptr;
+ }
+
LEAVE_SAFE;
{
1.612 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- Changes 2001/07/10 03:30:29 1.611
+++ Changes 2001/07/11 03:02:28 1.612
@@ -10,6 +10,9 @@
=item 1.25_02-dev
+Apache->server will now point the current VirtualHost when inside a
+<Perl> section, thanks to Robin Berjon for the spot
+
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
