Bug 122560 - Skip excuse-me on Bugzilla::HTTPServerSimple::FakeExit, remove __END__ before caching sub
git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1757 6955db30-a419-402b-8a0d-67ecbb4d7f56master
parent
2475a41ccc
commit
9b59aa829a
|
@ -67,9 +67,10 @@ sub _die_error
|
|||
{
|
||||
die @_;
|
||||
}
|
||||
if (ref $_[0] eq 'Bugzilla::Error')
|
||||
if (ref $_[0] eq 'Bugzilla::Error' || ref $_[0] eq 'Bugzilla::HTTPServerSimple::FakeExit')
|
||||
{
|
||||
# Bugzilla::Error has overloaded conversion to string
|
||||
# Bugzilla::HTTPServerSimple::FakeExit should only terminate the request
|
||||
die @_;
|
||||
}
|
||||
else
|
||||
|
|
|
@ -150,6 +150,7 @@ sub handle_request
|
|||
close $fd;
|
||||
# untaint
|
||||
($content) = $content =~ /^(.*)$/s;
|
||||
$content =~ s/\n__END__.*/\n/s;
|
||||
}
|
||||
if ($ENV{NYTPROF} && $INC{'Devel/NYTProf.pm'})
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue