You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2017/04/11 03:17:35 UTC
svn commit: r1790909 -
/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm
Author: kmcgrail
Date: Tue Apr 11 03:17:35 2017
New Revision: 1790909
URL: http://svn.apache.org/viewvc?rev=1790909&view=rev
Log:
KG: Syncing Trunk to 3.4: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7305
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm?rev=1790909&r1=1790908&r2=1790909&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Stderr.pm Tue Apr 11 03:17:35 2017
@@ -72,8 +72,9 @@ sub log_message {
if (!defined $fmt) {
# default since 3.3.0
my $now = Time::HiRes::time;
- $timestamp = sprintf("%s:%06.3f",
- POSIX::strftime("%b %d %H:%M", localtime($now)), $now-int($now/60)*60);
+ my $datetime = POSIX::strftime("%b %d %H:%M", localtime($now));
+ utf8::encode($datetime) if utf8::is_utf8($datetime); # Bug 7305
+ $timestamp = sprintf("%s:%06.3f", $datetime, $now-int($now/60)*60);
# Bug 6329: %e is not in a POSIX standard, use %d instead and edit
local $1; $timestamp =~ s/^(\S+\s+)0/$1 /;
} elsif ($fmt eq '') {