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 go...@apache.org on 2003/05/20 08:02:47 UTC
cvs commit: modperl-2.0/src/modules/perl mod_perl.c modperl_config.c
gozer 2003/05/19 23:02:47
Modified: src/modules/perl mod_perl.c modperl_config.c
Log:
Move modperl_gtop_new to modperl_config_srv_new to guarantee that
scfg->gtop will be present when MP_USE_GTOP is used
Reviewed by: stas
Revision Changes Path
1.171 +0 -1 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.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- mod_perl.c 2 May 2003 01:35:03 -0000 1.170
+++ mod_perl.c 20 May 2003 06:02:47 -0000 1.171
@@ -147,7 +147,6 @@
#ifdef MP_USE_GTOP
MP_TRACE_m_do(
- scfg->gtop = modperl_gtop_new(p);
modperl_gtop_do_proc_mem_before(MP_FUNC ": perl_parse");
);
#endif
1.63 +4 -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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- modperl_config.c 3 Feb 2003 06:40:33 -0000 1.62
+++ modperl_config.c 20 May 2003 06:02:47 -0000 1.63
@@ -112,6 +112,10 @@
scfg->PassEnv = apr_table_make(p, 2);
scfg->SetEnv = apr_table_make(p, 2);
+#ifdef MP_USE_GTOP
+ scfg->gtop = modperl_gtop_new(p);
+#endif
+
modperl_config_srv_argv_push((char *)ap_server_argv0);
MP_TRACE_d(MP_FUNC, "0x%lx\n", (unsigned long)scfg);