From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 18 May 2015 10:20:27 +0000 (+0200)
Subject: Bug 1155009: Cache::Memcached causes email_in.pl to stop working
X-Git-Tag: release-5.1.1~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2102accd812ed94488a9aa9e7277ad66a4d99c65;p=thirdparty%2Fbugzilla.git

Bug 1155009: Cache::Memcached causes email_in.pl to stop working
r/a=glob
---

diff --git a/email_in.pl b/email_in.pl
index 70ef26b6c0..448d75d0ee 100755
--- a/email_in.pl
+++ b/email_in.pl
@@ -466,7 +466,7 @@ sub die_handler {
 
     # If this is inside an eval, then we should just act like...we're
     # in an eval (instead of printing the error and exiting).
-    die(@_) if $^S;
+    die @_ if ($^S // Bugzilla::Error::_in_eval());
 
     # We can't depend on the MTA to send an error message, so we have
     # to generate one properly.