From 321cb734d8944e7edbe7bb139f44afa9f8e30c81 Mon Sep 17 00:00:00 2001
From: vfilippov <vfilippov@6955db30-a419-402b-8a0d-67ecbb4d7f56>
Date: Wed, 15 Dec 2010 18:20:20 +0000
Subject: [PATCH] Bug 58633 - Show KittenError instead of "Internal error" even
 on *.cgi compile errors

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1179 6955db30-a419-402b-8a0d-67ecbb4d7f56
---
 Bugzilla.pm |  5 +----
 mod_perl.pl | 10 ++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 928c19a72..7458a698e 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -124,10 +124,6 @@ my $re_encoded_word = qr{
 my $re_especials = qr{$re_encoded_word}xo;
 # >>>
 
-undef &Encode::MIME::Header::encode;
-
-*Encode::MIME::Header::encode = *encode_mime_header;
-
 sub encode_mime_header($$;$) {
     my ( $obj, $str, $chk ) = @_;
     my @line = ();
@@ -161,6 +157,7 @@ sub encode_mime_header($$;$) {
     return join( "\n", @line );
 }
 
+*Encode::MIME::Header::encode = *Bugzilla::encode_mime_header;
 }
 
 #####################################################################
diff --git a/mod_perl.pl b/mod_perl.pl
index 50e6d6f47..b69b0fcff 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -119,6 +119,16 @@ sub handler : method {
     return $class->SUPER::handler(@_);
 }
 
+sub error_check
+{
+    my $self = shift;
+    if ($@ && !(ref $@ eq 'APR::Error' && $@ == ModPerl::EXIT))
+    {
+        die $@;
+    }
+    return $self->SUPER::error_check(@_);
+}
+
 my $STATS;
 
 # To reload Perl modules on-the-fly (debug purposes),