Commit 22d395ee authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org

Bug 407420: CGI::Carp fatalsToBrowser should happen as early as possible

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=justdave, a=mkanat
parent c2ebd1bb
......@@ -26,6 +26,15 @@ package Bugzilla;
use strict;
# We want any compile errors to get to the browser, if possible.
BEGIN {
# This makes sure we're in a CGI.
if ($ENV{SERVER_SOFTWARE} && !$ENV{MOD_PERL}) {
require CGI::Carp;
CGI::Carp->import('fatalsToBrowser');
}
}
use Bugzilla::Config;
use Bugzilla::Constants;
use Bugzilla::Auth;
......
......@@ -62,13 +62,6 @@ sub new {
my $self = $class->SUPER::new(@args);
if (Bugzilla->error_mode eq ERROR_MODE_WEBPAGE) {
# This happens here so that command-line scripts don't spit out
# their errors in HTML format.
require CGI::Carp;
import CGI::Carp qw(fatalsToBrowser);
}
# Make sure our outgoing cookie list is empty on each invocation
$self->{Bugzilla_cookie_list} = [];
......
......@@ -92,6 +92,11 @@ sub handler : method {
# $0 is broken under mod_perl before 2.0.2, so we have to set it
# here explicitly or init_page's shutdownhtml code won't work right.
$0 = $ENV{'SCRIPT_FILENAME'};
# Make all errors go to the browser, not the log.
require CGI::Carp;
CGI::Carp->import('fatalsToBrowser');
Bugzilla::init_page();
return $class->SUPER::handler(@_);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment