dougm 2002/09/04 10:10:15
Modified: lib/ModPerl Code.pm
src/modules/perl mod_perl.c mod_perl.h
xs/ModPerl/Const Const.pm
Log:
add modperl_const{ants}.o to mod_perl.so to make constant lookup
functions available.
Revision Changes Path
1.88 +2 -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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- Code.pm 28 Aug 2002 03:16:20 -0000 1.87
+++ Code.pm 4 Sep 2002 17:10:14 -0000 1.88
@@ -569,7 +569,8 @@
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_global perl_pp sys module svptr_table);
+ perl perl_global perl_pp sys module svptr_table
+ const constants);
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.135 +3 -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.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- mod_perl.c 27 Aug 2002 04:26:54 -0000 1.134
+++ mod_perl.c 4 Sep 2002 17:10:14 -0000 1.135
@@ -63,6 +63,9 @@
newCONSTSUB(PL_defstash, name, newSViv(1));
}
+ /* outside mod_perl this is done by ModPerl::Const.xs */
+ newXS("ModPerl::Const::compile", XS_modperl_const_compile, __FILE__);
+
newCONSTSUB(PL_defstash, "Apache::MPM_IS_THREADED",
newSViv(scfg->threaded_mpm));
1.53 +2 -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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mod_perl.h 28 Aug 2002 03:17:02 -0000 1.52
+++ mod_perl.h 4 Sep 2002 17:10:15 -0000 1.53
@@ -19,6 +19,8 @@
#include "modperl_perl_global.h"
#include "modperl_perl_pp.h"
#include "modperl_sys.h"
+#include "modperl_const.h"
+#include "modperl_constants.h"
/* both perl and apr have largefile support enabled */
#define MP_LARGE_FILES_ENABLED \
1.3 +4 -1 modperl-2.0/xs/ModPerl/Const/Const.pm
Index: Const.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/ModPerl/Const/Const.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Const.pm 12 Oct 2001 00:52:32 -0000 1.2
+++ Const.pm 4 Sep 2002 17:10:15 -0000 1.3
@@ -12,7 +12,10 @@
$Config::Config{dlsrc} eq 'dl_dlopen.xs' ? 0x01 : 0x0;
sub dl_load_flags { DL_GLOBAL }
-__PACKAGE__->bootstrap($VERSION);
+#only bootstrap for use outside of mod_perl
+unless (defined &Modperl::Const::compile) {
+ __PACKAGE__->bootstrap($VERSION);
+}
sub import {
my $class = shift;
