dougm 01/09/27 12:04:39
Modified: lib/ModPerl Code.pm
src/modules/perl mod_perl.c mod_perl.h modperl_types.h
Log:
integrate modperl_perl_global module
Revision Changes Path
1.69 +1 -1 modperl-2.0/lib/ModPerl/Code.pm
Index: Code.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Code.pm 2001/09/20 06:07:48 1.68
+++ Code.pm 2001/09/27 19:04:38 1.69
@@ -525,7 +525,7 @@
my @c_src_names = qw(interp tipool log config cmd options callback handler
gtop util io filter bucket mgv pcw global env cgi
- perl);
+ perl perl_global);
my @g_c_names = map { "modperl_$_" } qw(hooks directives flags xsinit);
my @c_names = ('mod_perl', (map "modperl_$_", @c_src_names));
sub c_files { [map { "$_.c" } @c_names, @g_c_names] }
1.75 +4 -0 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mod_perl.c 2001/09/27 15:56:44 1.74
+++ mod_perl.c 2001/09/27 19:04:38 1.75
@@ -510,6 +510,8 @@
rcfg->wbucket.header_parse = 1;
}
+ modperl_perl_global_save(aTHX_ &rcfg->perl_globals);
+
h_stdout = modperl_io_tie_stdout(aTHX_ r);
h_stdin = modperl_io_tie_stdin(aTHX_ r);
@@ -520,6 +522,8 @@
modperl_io_handle_untie(aTHX_ h_stdin);
modperl_env_request_untie(aTHX_ r);
+
+ modperl_perl_global_restore(aTHX_ &rcfg->perl_globals);
#ifdef USE_ITHREADS
if (MpInterpPUTBACK(interp)) {
1.38 +1 -0 modperl-2.0/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_perl.h 2001/09/27 15:26:36 1.37
+++ mod_perl.h 2001/09/27 19:04:38 1.38
@@ -12,6 +12,7 @@
#include "modperl_flags.h"
#include "modperl_hooks.h"
+#include "modperl_perl_global.h"
#ifdef MP_USE_GTOP
#include "modperl_gtop.h"
1.47 +1 -0 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- modperl_types.h 2001/08/30 05:15:51 1.46
+++ modperl_types.h 2001/09/27 19:04:38 1.47
@@ -205,6 +205,7 @@
modperl_wbucket_t wbucket;
MpAV *handlers_per_dir[MP_HANDLER_NUM_PER_DIR];
MpAV *handlers_per_srv[MP_HANDLER_NUM_PER_SRV];
+ modperl_perl_globals_t perl_globals;
#ifdef USE_ITHREADS
modperl_interp_t *interp;
#endif
