From b69a47075f1936dce2ef931efd49ad95c4be03a2 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <mkanat%bugzilla.org>
Date: Wed, 5 Jul 2006 23:33:25 +0000
Subject: [PATCH] Bug 343361: die_with_dignity is useless inside of
 Bugzilla::CGI Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit,
 r=colin, a=myk

---
 webtools/bugzilla/Bugzilla.pm     | 13 +++++++++++++
 webtools/bugzilla/Bugzilla/CGI.pm | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/webtools/bugzilla/Bugzilla.pm b/webtools/bugzilla/Bugzilla.pm
index 0d6e6af7da87..e22ab97bf8b4 100644
--- a/webtools/bugzilla/Bugzilla.pm
+++ b/webtools/bugzilla/Bugzilla.pm
@@ -61,6 +61,19 @@ use constant SHUTDOWNHTML_EXIT_SILENTLY => [
 # Global Code
 #####################################################################
 
+# The following subroutine is for debugging purposes only.
+# Uncommenting this sub and the $::SIG{__DIE__} trap underneath it will
+# cause any fatal errors to result in a call stack trace to help track
+# down weird errors.
+#
+#sub die_with_dignity {
+#    use Carp ();
+#    my ($err_msg) = @_;
+#    print $err_msg;
+#    Carp::confess($err_msg);
+#}
+#$::SIG{__DIE__} = \&Bugzilla::die_with_dignity;
+
 # Some environment variables are not taint safe
 delete @::ENV{'PATH', 'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
 
diff --git a/webtools/bugzilla/Bugzilla/CGI.pm b/webtools/bugzilla/Bugzilla/CGI.pm
index 688878b19ac2..b4bcf20c8b01 100644
--- a/webtools/bugzilla/Bugzilla/CGI.pm
+++ b/webtools/bugzilla/Bugzilla/CGI.pm
@@ -50,18 +50,6 @@ $| = 1;
 $::SIG{TERM} = 'IGNORE';
 $::SIG{PIPE} = 'IGNORE';
 
-# The following subroutine is for debugging purposes only.
-# Uncommenting this sub and the $::SIG{__DIE__} trap underneath it will
-# cause any fatal errors to result in a call stack trace to help track
-# down weird errors.
-#sub die_with_dignity {
-#    use Carp;  # for confess()
-#    my ($err_msg) = @_;
-#    print $err_msg;
-#    confess($err_msg);
-#}
-#$::SIG{__DIE__} = \&die_with_dignity;
-
 # CGI.pm uses AUTOLOAD, but explicitly defines a DESTROY sub.
 # We need to do so, too, otherwise perl dies when the object is destroyed
 # and we don't have a DESTROY method (because CGI.pm's AUTOLOAD will |die|