From 69502140d2e229a314bb1eb192d31b9a2c14f981 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 31 Jul 2015 22:40:28 +0200
Subject: Log debug messages to STDERR unless 'logfile' is set.

However don't include timestamps to STDERR, that's the job of the
syslog.
---
 lib/Net/IMAP/Sync.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/Net/IMAP/Sync.pm b/lib/Net/IMAP/Sync.pm
index 47c6258..b44f0a6 100644
--- a/lib/Net/IMAP/Sync.pm
+++ b/lib/Net/IMAP/Sync.pm
@@ -392,7 +392,7 @@ sub DESTROY($) {
 sub log($@) {
     my $self = shift;
     return unless @_;
-    $self->logger(@_) if defined $self->{'logger-fd'} and $self->{'logger-fd'} ne \*STDERR;
+    $self->logger(@_) if defined $self->{'logger-fd'} and $self->{'logger-fd'}->fileno != fileno STDERR;
     my $prefix = defined $self->{name} ? $self->{name} : '';
     $prefix .= "($self->{_SELECTED})" if $self->{_STATE} eq 'SELECTED';
     print STDERR $prefix, ': ', @_, "\n";
@@ -400,7 +400,10 @@ sub log($@) {
 sub logger($@) {
     my $self = shift;
     return unless @_ and defined $self->{'logger-fd'};
-    my $prefix = strftime "%b %e %H:%M:%S ", localtime;
+    my $prefix = '';
+    if ($self->{'logger-fd'}->fileno != fileno STDERR) {
+        $prefix = strftime "%b %e %H:%M:%S ", localtime;
+    }
     $prefix .= defined "$self->{name}" ? $self->{name} : '';
     $prefix .= "($self->{_SELECTED})" if $self->{_STATE} eq 'SELECTED';
     $self->{'logger-fd'}->say($prefix, ': ', @_);
-- 
cgit v1.2.3


From a9071cd1c10bcf3a2203a28cdbdf0a26b4db8641 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 31 Jul 2015 22:41:24 +0200
Subject: Log high precision timestamps in the logfile.

Also, don't try to import POSIX or Time::HiRes unless the logfile is
configured.
---
 lib/Net/IMAP/Sync.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/Net/IMAP/Sync.pm b/lib/Net/IMAP/Sync.pm
index b44f0a6..4a9d431 100644
--- a/lib/Net/IMAP/Sync.pm
+++ b/lib/Net/IMAP/Sync.pm
@@ -23,7 +23,6 @@ use strict;
 use Config::Tiny ();
 use IO::Select ();
 use List::Util 'first';
-use POSIX 'strftime';
 use Socket 'SO_KEEPALIVE';
 
 use Exporter 'import';
@@ -288,6 +287,11 @@ sub new($%) {
     # are considered.
     $self->{_MODIFIED} = {};
 
+    if (defined $self->{'logger-fd'} and $self->{'logger-fd'}->fileno != fileno STDERR) {
+        require 'POSIX.pm';
+        require 'Time/HiRes.pm';
+    }
+
     # wait for the greeting
     my $x = $self->_getline();
     $x =~ s/\A\* (OK|PREAUTH) // or $self->panic($x);
@@ -402,7 +406,8 @@ sub logger($@) {
     return unless @_ and defined $self->{'logger-fd'};
     my $prefix = '';
     if ($self->{'logger-fd'}->fileno != fileno STDERR) {
-        $prefix = strftime "%b %e %H:%M:%S ", localtime;
+        my ($s, $us) = Time::HiRes::gettimeofday();
+        $prefix = POSIX::strftime("%b %e %H:%M:%S", localtime($s)).".$us ";
     }
     $prefix .= defined "$self->{name}" ? $self->{name} : '';
     $prefix .= "($self->{_SELECTED})" if $self->{_STATE} eq 'SELECTED';
-- 
cgit v1.2.3


From b1985240f59a22b27824c9fdcb79998a1c7c0396 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 9 Aug 2015 20:38:30 +0200
Subject: Add support for SASL-IR (RFC 4959) to save a round-trip in
 AUTHENTICATE commands.

---
 lib/Net/IMAP/Sync.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/Net/IMAP/Sync.pm b/lib/Net/IMAP/Sync.pm
index 4a9d431..85ca487 100644
--- a/lib/Net/IMAP/Sync.pm
+++ b/lib/Net/IMAP/Sync.pm
@@ -347,9 +347,13 @@ sub new($%) {
         elsif ($mech eq 'PLAIN') {
             require 'MIME/Base64.pm';
             $self->fail("Missing option $_") foreach grep {!defined $self->{$_}} qw/username password/;
-            $command = "AUTHENTICATE $mech";
             my $credentials = MIME::Base64::encode_base64("\x00".$username."\x00".$password, '');
-            $callback = sub($) {return $credentials};
+            $command = "AUTHENTICATE $mech";
+            if ($self->_capable('SASL-IR')) { # RFC 4959 SASL-IR
+                $command .= " $credentials";
+            } else {
+                $callback = sub($) {return $credentials};
+            }
         }
         else {
             $self->fail("Unsupported authentication mechanism: $mech");
-- 
cgit v1.2.3