svn commit: r483050 - in /spamassassin/trunk: spamassassin.raw spamd/spamd.raw

[jm...@apache.org]

Author: jm
Date: Wed Dec  6 04:27:17 2006
New Revision: 483050

URL: http://svn.apache.org/viewvc?view=rev&rev=483050
Log:
use $^S to avoid logging inside evals.  you learn something new every day

Modified:
    spamassassin/trunk/spamassassin.raw
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.raw?view=diff&rev=483050&r1=483049&r2=483050
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Wed Dec  6 04:27:17 2006
@@ -85,7 +85,8 @@
   # redirect __WARN__ and __DIE__, but NOT until after the
   # Mail::SpamAssassin::Logger class has been parsed.
   $SIG{__WARN__} = sub {
-    log_message("warn", $_[0]);
+    # see http://use.perl.org/comments.pl?mode=flat&sid=33872 for $^S
+    log_message("warn", $_[0]) unless $^S;
   };
 };
 

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?view=diff&rev=483050&r1=483049&r2=483050
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Wed Dec  6 04:27:17 2006
@@ -112,10 +112,11 @@
   Time::HiRes->import(qw(time)) unless $@;
   # redirect __WARN__ and __DIE__
   $SIG{__WARN__} = sub {
-    log_message("warn", $_[0]);
+    # see http://use.perl.org/comments.pl?mode=flat&sid=33872 for $^S
+    log_message("warn", $_[0]) unless $^S;
   };
   $SIG{__DIE__} = sub {
-    log_message("error", $_[0]) if $_[0] !~ /\bin eval\b/;
+    log_message("error", $_[0]) unless $^S;
   };
 }