diff options
| -rw-r--r-- | lib/PublicInbox/IMAP.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/IMAPD.pm | 1 | ||||
| -rw-r--r-- | t/pop3d.t | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index 00f99ef7..3c64cefa 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -39,7 +39,6 @@ use PublicInbox::DS qw(now); use PublicInbox::GitAsyncCat; use Text::ParseWords qw(parse_line); use Errno qw(EAGAIN); -use PublicInbox::IMAPsearchqp; my $Address; for my $mod (qw(Email::Address::XS Mail::Address)) { @@ -1088,6 +1087,7 @@ sub search_uid_range { # long_response sub parse_imap_query ($$) { my ($self, $query) = @_; + # IMAPsearchqp gets loaded in IMAPD->refresh_groups my $q = PublicInbox::IMAPsearchqp::parse($self, $query); if (ref($q)) { my $max = $self->{ibx}->over(1)->max; diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm index 78323e57..bdadb7a3 100644 --- a/lib/PublicInbox/IMAPD.pm +++ b/lib/PublicInbox/IMAPD.pm @@ -55,6 +55,7 @@ sub _refresh_ibx { # pi_cfg->each_inbox cb sub refresh_groups { my ($self, $sig) = @_; my $pi_cfg = PublicInbox::Config->new; + require PublicInbox::IMAPsearchqp; $self->{mailboxes} = $pi_cfg->{-imap_mailboxes} // do { my $mailboxes = $self->{mailboxes} = {}; my $cache = eval { $pi_cfg->ALL->misc->nntpd_cache_load } // {}; @@ -276,7 +276,7 @@ EOF like($x, qr/\Adataready\0+\z/, 'got dataready accf for pop3s'); $x = getsockopt($stls, IPPROTO_TCP, $PublicInbox::Daemon::SO_ACCEPTFILTER); - is($x, undef, 'no BSD accept filter for plain IMAP'); + is($x, undef, 'no BSD accept filter for plain POP3'); }; $td->kill; |