dougm 01/06/18 20:12:48
Modified: . Makefile.PL
src/modules/perl mod_perl.c mod_perl.h perl_config.c
Log:
remove dead code for PERL_STARTUP_{IS_DONE,DONE_CHECK} hack
Revision Changes Path
1.187 +0 -2 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- Makefile.PL 2001/06/14 04:49:07 1.186
+++ Makefile.PL 2001/06/19 03:12:41 1.187
@@ -232,8 +232,6 @@
my %experimental = map { $_,1 } qw{
PERL_AUTOPRELOAD
-PERL_DSO_UNLOAD
-PERL_STARTUP_DONE_CHECK
PERL_RUN_XS
PERL_MARK_WHERE
DO_INTERNAL_REDIRECT
1.140 +5 -21 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mod_perl.c 2001/06/19 02:38:54 1.139
+++ mod_perl.c 2001/06/19 03:12:44 1.140
@@ -603,7 +603,7 @@
dstr = NULL;
#endif
- if(PERL_RUNNING() && PERL_STARTUP_IS_DONE) {
+ if(PERL_RUNNING()) {
saveINC;
mp_check_version();
#if !HAS_MMN_136
@@ -760,22 +760,6 @@
GvIMPORTED_CV_on(exitgp);
}
- if(PERL_STARTUP_DONE_CHECK) {
- char *psd = getenv("PERL_STARTUP_DONE");
- if (!psd) {
- MP_TRACE_g(fprintf(stderr,
- "mod_perl: PerlModule,PerlRequire postponed\n"));
- my_setenv("PERL_STARTUP_DONE", "1");
- saveINC;
- return;
- }
- else {
- MP_TRACE_g(fprintf(stderr,
- "mod_perl: postponed PerlModule,PerlRequire
enabled\n"));
- my_setenv("PERL_STARTUP_DONE", "2");
- }
- }
-
ENTER_SAFE(s,p);
MP_TRACE_g(mod_perl_dump_opmask());
@@ -808,10 +792,10 @@
#endif
saveINC;
-#if MODULE_MAGIC_NUMBER >= MMN_130
- if(perl_module.dynamic_load_handle)
- register_cleanup(p, p, mp_dso_unload, null_cleanup);
-#endif
+
+ if (PERL_IS_DSO) {
+ register_cleanup(p, p, mp_dso_unload, null_cleanup);
+ }
}
int mod_perl_sent_header(request_rec *r, int val)
1.109 +0 -11 modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mod_perl.h 2001/02/16 23:30:27 1.108
+++ mod_perl.h 2001/06/19 03:12:45 1.109
@@ -503,17 +503,6 @@
# endif
#endif
-#ifndef PERL_STARTUP_DONE_CHECK
-#define PERL_STARTUP_DONE_CHECK getenv("PERL_STARTUP_DONE_CHECK")
-#endif
-
-#define PERL_STARTUP_IS_DONE \
-(!PERL_STARTUP_DONE_CHECK || strEQ(getenv("PERL_STARTUP_DONE"), "2"))
-
-#ifndef PERL_DSO_UNLOAD
-#define PERL_DSO_UNLOAD getenv("PERL_DSO_UNLOAD")
-#endif
-
#ifdef APACHE_SSL
#define PERL_DONE_STARTUP 1
#else
1.110 +22 -26 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.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- perl_config.c 2001/05/15 17:02:32 1.109
+++ perl_config.c 2001/06/19 03:12:45 1.110
@@ -593,21 +593,19 @@
MP_TRACE_d(fprintf(stderr, "PerlModule: arg='%s'\n", arg));
if(PERL_RUNNING()) {
- if (PERL_STARTUP_IS_DONE) {
- if (perl_require_module(arg, NULL) != OK) {
- dTHR;
- STRLEN n_a;
- dTHRCTX;
- return SvPV(ERRSV,n_a);
- }
+ if (perl_require_module(arg, NULL) != OK) {
+ dTHR;
+ STRLEN n_a;
+ dTHRCTX;
+ return SvPV(ERRSV,n_a);
+ }
#ifdef PERL_SECTIONS
- else {
- if (CAN_SELF_BOOT_SECTIONS) {
- perl_section_self_boot(parms, dummy, arg);
- }
- }
+ else {
+ if (CAN_SELF_BOOT_SECTIONS) {
+ perl_section_self_boot(parms, dummy, arg);
+ }
+ }
#endif
- }
}
else {
/* Delay processing it until Perl starts */
@@ -625,21 +623,19 @@
MP_TRACE_d(fprintf(stderr, "PerlRequire: arg=`%s'\n", arg));
if(PERL_RUNNING()) {
- if (PERL_STARTUP_IS_DONE) {
- if (perl_load_startup_script(parms->server, parms->pool, arg, TRUE) != OK)
{
- dTHR;
- STRLEN n_a;
- dTHRCTX;
- return SvPV(ERRSV,n_a);
- }
+ if (perl_load_startup_script(parms->server, parms->pool, arg, TRUE) != OK) {
+ dTHR;
+ STRLEN n_a;
+ dTHRCTX;
+ return SvPV(ERRSV,n_a);
+ }
#ifdef PERL_SECTIONS
- else {
- if (CAN_SELF_BOOT_SECTIONS) {
- perl_section_self_boot(parms, dummy, arg);
- }
- }
+ else {
+ if (CAN_SELF_BOOT_SECTIONS) {
+ perl_section_self_boot(parms, dummy, arg);
+ }
+ }
#endif
- }
}
else {
/* Delay processing it until Perl starts */
