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 1999/01/18 04:02:27 UTC
cvs commit: modperl/src/modules/perl perl_config.c
dougm 99/01/17 19:02:27
Modified: . Changes ToDo
src/modules/perl perl_config.c
Log:
PerlRequire/PerlModule will not let the server start if there is an
error
Revision Changes Path
1.241 +3 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- Changes 1999/01/18 02:46:33 1.240
+++ Changes 1999/01/18 03:02:25 1.241
@@ -8,6 +8,9 @@
=item 1.17_01-dev
+PerlRequire/PerlModule will not let the server start if there is an
+error (bug introduced in 1.16_xx), thanks to Brian Moseley for the spot
+
5.005_54+usethreads port [Brian P Millett <bp...@ec-group.com>]
fix -w command line logic for Apache::Registry
1.142 +0 -2 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- ToDo 1999/01/18 02:46:34 1.141
+++ ToDo 1999/01/18 03:02:25 1.142
@@ -7,8 +7,6 @@
- $VERSION/Revision troubles CPAN.pm (e.g. Apache::Status)
-- server does not die if a PerlModule/PerlRequire dies
-
- Apache::Server->keep_alive_timeout/timeout
- $r->finfo needs to set PL_laststatval
1.62 +10 -4 modperl/src/modules/perl/perl_config.c
Index: perl_config.c
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/perl_config.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- perl_config.c 1999/01/18 02:46:35 1.61
+++ perl_config.c 1999/01/18 03:02:26 1.62
@@ -504,8 +504,11 @@
dPSRV(parms->server);
if(!PERL_RUNNING()) perl_startup(parms->server, parms->pool);
require_Apache(parms->server);
- if(PERL_RUNNING())
- perl_require_module(arg, parms->server);
+ if(PERL_RUNNING()) {
+ if (perl_require_module(arg, NULL) != OK) {
+ return SvPV(ERRSV,na);
+ }
+ }
else {
char **new;
MP_TRACE_d(fprintf(stderr, "push_perl_modules: arg='%s'\n", arg));
@@ -526,8 +529,11 @@
dPSRV(parms->server);
if(!PERL_RUNNING()) perl_startup(parms->server, parms->pool);
MP_TRACE_d(fprintf(stderr, "perl_cmd_require: %s\n", arg));
- if(PERL_RUNNING())
- perl_load_startup_script(parms->server, parms->pool, arg, TRUE);
+ if(PERL_RUNNING()) {
+ if (perl_load_startup_script(NULL, parms->pool, arg, TRUE) != OK) {
+ return SvPV(ERRSV,na);
+ }
+ }
else {
char **new;
new = (char **)push_array(cls->PerlRequire);