[Bps-public-commit] Net-IMAP-Server branch, master, updated. 1.28-6-g60edd5f

[Alex Vandiver]

The branch, master has been updated
       via  60edd5f94c6310ff3de3466a423a13c9b3714f1a (commit)
       via  5d3e9a22b8b703c5584b36816c64f1da1c69757d (commit)
       via  1046ab8b52feb544b1aa2ba863087ea259d148dc (commit)
      from  0a02ed15deaefb2a93b9adabeeb13efb8fd19876 (commit)

Summary of changes:
 lib/Net/IMAP/Server/Command/Search.pm |    2 +-
 lib/Net/IMAP/Server/Command/Uid.pm    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 1046ab8b52feb544b1aa2ba863087ea259d148dc
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jul 19 23:14:41 2010 -0700

    There is no no_failed; use BAD, like Cyrus and Dovecot

diff --git a/lib/Net/IMAP/Server/Command/Uid.pm b/lib/Net/IMAP/Server/Command/Uid.pm
index 6a5266e..cad143b 100644
--- a/lib/Net/IMAP/Server/Command/Uid.pm
+++ b/lib/Net/IMAP/Server/Command/Uid.pm
@@ -31,8 +31,8 @@ sub run {
     } else {
         $self->log(
             $subcommand . " wasn't understood by the 'UID' command" );
-        $self->no_failed(
-            alert => q{Your client sent a UID command we didn't understand} );
+        $self->bad_command(
+            q{Unrecognized UID command $subcommand} );
     }
 
 }

commit 5d3e9a22b8b703c5584b36816c64f1da1c69757d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jul 20 00:54:34 2010 -0700

    Fix "UID SEARCH 1,2"

diff --git a/lib/Net/IMAP/Server/Command/Search.pm b/lib/Net/IMAP/Server/Command/Search.pm
index bb3fe94..c0b4010 100644
--- a/lib/Net/IMAP/Server/Command/Search.pm
+++ b/lib/Net/IMAP/Server/Command/Search.pm
@@ -166,7 +166,7 @@ sub filter {
             push @{$filters}, sub {not $_[0]->has_flag($keyword)};
         } elsif ($token eq "UNSEEN") {
             push @{$filters}, sub {not $_[0]->has_flag('\Seen')};
-        } elsif ($token =~ /^\d+(:\d+|:\*)?(,\d+(:\d+|:\*))*$/) {
+        } elsif ($token =~ /^\d+(:\d+|:\*)?(,\d+(:\d+|:\*)?)*$/) {
             my %uids;
             $uids{$_->uid}++ for $self->connection->get_messages($token);
             push @{$filters}, sub {$uids{$_[0]->uid}};

commit 60edd5f94c6310ff3de3466a423a13c9b3714f1a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jul 20 00:56:12 2010 -0700

    Allow "UID SEARCH *"

diff --git a/lib/Net/IMAP/Server/Command/Search.pm b/lib/Net/IMAP/Server/Command/Search.pm
index c0b4010..e60aeab 100644
--- a/lib/Net/IMAP/Server/Command/Search.pm
+++ b/lib/Net/IMAP/Server/Command/Search.pm
@@ -166,7 +166,7 @@ sub filter {
             push @{$filters}, sub {not $_[0]->has_flag($keyword)};
         } elsif ($token eq "UNSEEN") {
             push @{$filters}, sub {not $_[0]->has_flag('\Seen')};
-        } elsif ($token =~ /^\d+(:\d+|:\*)?(,\d+(:\d+|:\*)?)*$/) {
+        } elsif ($token =~ /^(\*|\d+)(:(\*|\d+))?(,(\*|\d+)(:(\*|\d+))?)*$/) {
             my %uids;
             $uids{$_->uid}++ for $self->connection->get_messages($token);
             push @{$filters}, sub {$uids{$_[0]->uid}};

-----------------------------------------------------------------------