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 do...@hyperreal.org on 1998/08/28 19:49:23 UTC
cvs commit: modperl/src/modules/perl mod_perl.h
dougm 98/08/28 10:49:23
Modified: . .gdbinit Changes Makefile.PL ToDo
src/modules/perl mod_perl.h
Log:
pushing out experimental stuff:
EXPERIMENTAL=1 (enables all experiments, except PERL_DEFAULT_OPMASK)
PERL_GET_SET_HANDLERS=1 if PERL_STACKED_HANDLERS
PERL_MARK_WHERE=1, PERL_TIE_SCRIPTNAME=1 if PERL_TRACE
PERL_SECTIONS_SELF_BOOT=1 if PERL_SECTIONS
Revision Changes Path
1.5 +2 -2 modperl/.gdbinit
Index: .gdbinit
===================================================================
RCS file: /export/home/cvs/modperl/.gdbinit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .gdbinit 1998/07/18 22:08:18 1.4
+++ .gdbinit 1998/08/28 17:49:20 1.5
@@ -22,11 +22,11 @@
end
define curstash
- print ((XPVHV*) (curstash)->sv_any)->xhv_name
+ print ((XPVHV*) (Perl_curstash)->sv_any)->xhv_name
end
define defstash
- print ((XPVHV*) (defstash)->sv_any)->xhv_name
+ print ((XPVHV*) (Perl_defstash)->sv_any)->xhv_name
end
define curcopfile
1.117 +6 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- Changes 1998/08/27 02:42:19 1.116
+++ Changes 1998/08/28 17:49:21 1.117
@@ -8,6 +8,12 @@
=item 1.15_01-dev
+pushing out experimental stuff:
+ EXPERIMENTAL=1 (enables all experiments, except PERL_DEFAULT_OPMASK)
+ PERL_GET_SET_HANDLERS=1 if PERL_STACKED_HANDLERS
+ PERL_MARK_WHERE=1, PERL_TIE_SCRIPTNAME=1 if PERL_TRACE
+ PERL_SECTIONS_SELF_BOOT=1 if PERL_SECTIONS
+
new $r->server->next method
removed use of Term::ReadLine in Makefile.PL to make it work on
1.86 +12 -4 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- Makefile.PL 1998/08/26 02:52:40 1.85
+++ Makefile.PL 1998/08/28 17:49:21 1.86
@@ -141,7 +141,7 @@
$USE_APACI = $USE_DSO = $USE_APXS = 0;
$WITH_APXS = "";
$APACI_ARGS = "";
-$EVERYTHING = 0;
+$EVERYTHING = $EXPERIMENTAL = 0;
$PERL_DEBUG = "";
$PERL_DESTRUCT_LEVEL = "";
$PERL_STATIC_EXTS = "";
@@ -177,6 +177,7 @@
$PERL_CONNECTION_API = 1; #these two were split out late in the game
$PERL_SERVER_API = 1; #so they are on by default
$PERL_RUN_XS = 0;
+
my %experimental = map { $_,1 } qw{
PERL_RUN_XS
PERL_GET_SET_HANDLERS
@@ -194,7 +195,7 @@
};
my @mp_args =
- qw(EVERYTHING DO_HTTPD NO_HTTPD CONFIG ADD_MODULE APACHE_PREFIX
+ qw(EXPERIMENTAL EVERYTHING DO_HTTPD NO_HTTPD CONFIG ADD_MODULE APACHE_PREFIX
USE_APACI USE_DSO USE_APXS WITH_APXS APACI_ARGS PREP_HTTPD
ALL_HOOKS ADD_VERSION STATIC DYNAMIC PORT XS_IMPORT);
@@ -268,6 +269,14 @@
$callback_hooks{$k} = $v if exists $callback_hooks{$k};
}
+if($EXPERIMENTAL) {
+ for (keys %experimental) {
+ next if $_ eq "PERL_DEFAULT_OPMASK"; #have to *really* ask for this one
+ next if $experimental{$_}++ > 1;
+ $PERL_EXTRA_CFLAGS .= " -D$_=1";
+ }
+}
+
if($experimental{PERL_DEFAULT_OPMASK} > 1) {
$experimental{PERL_SAFE_STARTUP} = 2;
$PERL_EXTRA_CFLAGS .= " -DPERL_SAFE_STARTUP=1";
@@ -313,7 +322,6 @@
}
}
-
if($ALL_HOOKS) {
for (@callback_hooks) {
next if /(Api|Table|Handler)s?$/i;
@@ -543,7 +551,7 @@
push @xs_modules, "Apache::Tie";
$callback_hooks{PERL_TIE_TABLES} = 1;
}
-if($PERL_RUN_XS) {
+if($PERL_RUN_XS or $experimental{PERL_RUN_XS} > 1) {
my $mmn = $USE_APXS ? MMN_130 : magic_number($APACHE_SRC);
if($mmn >= MMN_130) {
push @xs_modules, "Apache::PerlRunXS";
1.69 +3 -5 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ToDo 1998/08/27 02:39:55 1.68
+++ ToDo 1998/08/28 17:49:21 1.69
@@ -3,11 +3,7 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
-- pushing out experimental stuff:
- EXPERIMENTAL=1 (enable all experiments)
- PERL_GET_SET_HANDLERS=1 if PERL_STACKED_HANDLERS
- PERL_MARK_WHERE=1 if PERL_TRACE
- PERL_SECTIONS_SELF_BOOT=1 if PERL_SECTIONS
+- $r->log->$level(sub {})
- 'make htmldoc' (Brian Moseley)
@@ -38,6 +34,8 @@
- rand() broken under win32!
Jeff Baker <je...@godzilla.tamu.edu>
+
+- -Tw w/o PerlTaintCheck cause SEGV? Dave Hodgkinson <da...@sift.co.uk>
---------------------------------------------------------------------------
DOCUMENTATION (areas that *really* need some more or don't have any)
1.42 +27 -14 modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mod_perl.h 1998/08/13 03:19:38 1.41
+++ mod_perl.h 1998/08/28 17:49:23 1.42
@@ -170,10 +170,6 @@
#define PERL_DESTRUCT_LEVEL 0
#endif
-#ifndef PERL_SECTIONS_SELF_BOOT
-#define PERL_SECTIONS_SELF_BOOT getenv("PERL_SECTIONS_SELF_BOOT")
-#endif
-
#ifndef DO_INTERNAL_REDIRECT
#define DO_INTERNAL_REDIRECT perl_get_sv("Apache::DoInternalRedirect", FALSE)
#endif
@@ -182,16 +178,6 @@
#undef NO_PERL_RESTART
#endif
-#ifdef PERL_MARK_WHERE
-#define MARK_WHERE(w,s) \
- ENTER; \
- mod_perl_mark_where(w,s)
-#define UNMARK_WHERE LEAVE
-#else
-#define MARK_WHERE(w,s) mod_perl_noop(NULL)
-#define UNMARK_WHERE mod_perl_noop(NULL)
-#endif
-
typedef request_rec * Apache;
typedef request_rec * Apache__SubRequest;
typedef conn_rec * Apache__Connection;
@@ -261,6 +247,12 @@
#define MP_TRACE_h(a) if (mp_debug & 4) a /* handlers */
#define MP_TRACE_g(a) if (mp_debug & 8) a /* globals and allocation */
#define MP_TRACE_c(a) if (mp_debug & 16) a /* directive handlers */
+#ifndef PERL_MARK_WHERE
+#define PERL_MARK_WHERE
+#endif
+#ifndef PERL_TIE_SCRIPTNAME
+#define PERL_TIE_SCRIPTNAME
+#endif
#else
#define MP_TRACE(a)
#define MP_TRACE_d(a)
@@ -270,6 +262,16 @@
#define MP_TRACE_c(a)
#endif
+#ifdef PERL_MARK_WHERE
+#define MARK_WHERE(w,s) \
+ ENTER; \
+ mod_perl_mark_where(w,s)
+#define UNMARK_WHERE LEAVE
+#else
+#define MARK_WHERE(w,s) mod_perl_noop(NULL)
+#define UNMARK_WHERE mod_perl_noop(NULL)
+#endif
+
/* cut down on some noise in source */
#define dSTATUS \
int dstatus = DECLINED; \
@@ -366,6 +368,12 @@
#define PERL_SSI
#endif
+#ifdef PERL_SECTIONS
+#ifndef PERL_SECTIONS_SELF_BOOT
+#define PERL_SECTIONS_SELF_BOOT 1
+#endif
+#endif
+
#ifdef APACHE_SSL
#define PERL_DONE_STARTUP 1
#else
@@ -497,6 +505,11 @@
}
#ifdef PERL_STACKED_HANDLERS
+
+#ifndef PERL_GET_SET_HANDLERS
+#define PERL_GET_SET_HANDLERS
+#endif
+
#define PERL_TAKE ITERATE
#define PERL_CMD_INIT Nullav
#define PERL_CMD_TYPE AV