Change reference to INSTALL to configure.readme

Allow bypassing the installation of die and warn handler.

diff --git a/perl/FCGI.PL b/perl/FCGI.PL
index b4a60bd..7c6ee63 100644 (file)
--- a/perl/FCGI.PL
+++ b/perl/FCGI.PL
@@ -12,7 +12,7 @@ unless ($] >= 5.005) {
 print OUT while <DATA>;
 close OUT;
 __END__
-/* $Id: FCGI.PL,v 1.1 1999/02/13 05:26:42 roberts Exp $ */
+/* $Id: FCGI.PL,v 1.2 1999/02/28 17:46:31 skimo Exp $ */
 
 #include "EXTERN.h"
 #include "perl.h"
@@ -159,10 +159,16 @@ FCGI_Accept(void)
        sv_setiv(SvRV(svout), (IV) out);
        sv_setiv(SvRV(sverr), (IV) error);
        sv_setiv(SvRV(svin), (IV) in);
-       if (PL_warnhook) SvREFCNT_dec(PL_warnhook);
-       PL_warnhook = SvREFCNT_inc(GvCV(gv_fetchmethod(Nullhv, "FCGI::WARN")));
-       if (PL_diehook) SvREFCNT_dec(PL_diehook);
-       PL_diehook = SvREFCNT_inc(GvCV(gv_fetchmethod(Nullhv, "FCGI::DIE")));
+       if (!SvTRUEx(perl_get_sv("FCGI::no_warn_redirection", FALSE)))
+       {
+           if (PL_warnhook) SvREFCNT_dec(PL_warnhook);
+           PL_warnhook = SvREFCNT_inc(GvCV(gv_fetchmethod(Nullhv, "FCGI::WARN")));
+       }
+       if (!SvTRUEx(perl_get_sv("FCGI::no_die_redirection", FALSE)))
+       {
+           if (PL_diehook) SvREFCNT_dec(PL_diehook);
+           PL_diehook = SvREFCNT_inc(GvCV(gv_fetchmethod(Nullhv, "FCGI::DIE")));
+       }
 #endif
        finishCalled = FALSE;
         environ = envp;
@@ -191,11 +197,13 @@ FCGI_Finish(void)
     */
     finishCalled = TRUE;
 #ifndef USE_SFIO
-    if (PL_warnhook) {
+    if (!SvTRUEx(perl_get_sv("FCGI::no_warn_redirection", FALSE)) &&
+           PL_warnhook == (SV*)GvCV(gv_fetchmethod(Nullhv, "FCGI::WARN"))) {
        SvREFCNT_dec(PL_warnhook);
        PL_warnhook = Nullsv;
     }
-    if (PL_diehook) {
+    if (!SvTRUEx(perl_get_sv("FCGI::no_die_redirection", FALSE)) &&
+           PL_diehook == (SV*)GvCV(gv_fetchmethod(Nullhv, "FCGI::DIE"))) {
        SvREFCNT_dec(PL_diehook);
        PL_diehook = Nullsv;
     }

diff --git a/perl/MANIFEST b/perl/MANIFEST
index e1f7ee1..fe3c6ae 100644 (file)
--- a/perl/MANIFEST
+++ b/perl/MANIFEST
@@ -1,11 +1,11 @@
 ChangeLog
-FCGI.pm
 FCGI.PL
-INSTALL
+FCGI.pm
 MANIFEST
 Makefile.PL
 README
-echo.PL
 configure
 configure.in
+configure.readme
+echo.PL
 typemap

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index 5a15047..d998052 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL,v 1.1 1999/02/13 05:26:44 roberts Exp $
+# $Id: Makefile.PL,v 1.2 1999/02/28 17:46:29 skimo Exp $
 
 use ExtUtils::MakeMaker;
 use IO::File;
@@ -87,7 +87,7 @@ if ($sys eq "win32") {
 
 } else {
     print "Running ./configure for you\n";
-    print "Please read INSTALL for information on how to run it yourself\n";
+    print "Please read configure.readme for information on how to run it yourself\n";
 
     $ENV{'CC'} = $Config{'cc'};
     system("./configure");

diff --git a/perl/README b/perl/README
index 4d4d75d..7d15ed5 100644 (file)
--- a/perl/README
+++ b/perl/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 1999/02/13 05:26:45 roberts Exp $
+$Id: README,v 1.2 1999/02/28 17:46:30 skimo Exp $
 
     Copyright (c) 1996 Open Market, Inc.
     See the file "LICENSE.TERMS" for information on usage and redistribution
@@ -38,7 +38,7 @@ if you don't want that or if it doesn't find them.
 To configure the library Makefile.PL will run ./configure .
 You may want to run it yourself beforehand because its findings
 may not always be correct.
-The INSTALL file describes how to run ./configure (and only that).
+The configure.readme file describes how to run ./configure (and only that).
 
 If you're on a solaris system and your installed fcgi library is 2.02b
 or earlier, you'll probably want to use the included files.