From d56c99a3286afb63266d5019069d15ab4b647106 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Thu, 21 Jun 2018 17:00:55 -0400
Subject: try to fix webservice test again

---
 Bugzilla/Error.pm       | 5 -----
 Bugzilla/Quantum/CGI.pm | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index 9fcd16386..dcb79cfb2 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -124,11 +124,6 @@ sub _throw_error {
                                  message     => $message,
                                  id          => $server->{_bz_request_id},
                                  version     => $server->version);
-            # Most JSON-RPC Throw*Error calls happen within an eval inside
-            # of JSON::RPC. So, in that circumstance, instead of exiting,
-            # we die with no message. JSON::RPC checks raise_error before
-            # it checks $@, so it returns the proper error.
-            die if _in_eval();
             $server->response($server->error_response_header);
         }
     }
diff --git a/Bugzilla/Quantum/CGI.pm b/Bugzilla/Quantum/CGI.pm
index de4e59bb5..c36ed9654 100644
--- a/Bugzilla/Quantum/CGI.pm
+++ b/Bugzilla/Quantum/CGI.pm
@@ -65,7 +65,7 @@ sub load_one {
             $inner->();
         }
         catch {
-            die $_ unless ref $_ eq 'ARRAY' && $_->[0] eq "EXIT\n" || /^Died at.*Error\.pm/
+            die $_ unless ref $_ eq 'ARRAY' && $_->[0] eq "EXIT\n";
         }
         finally {
             untie *STDOUT;
-- 
cgit v1.2.3-24-g4f1b