Merge pull request #160 from mordak/idle-ok-still-here

Handle Dovecot's periodic IDLE notification messages ("OK Still here").

src/extensions/idle.rs

@@ -93,16 +93,26 @@ impl<'a, T: Read + Write + 'a> Handle<'a, T> {
     /// This is necessary so that we can keep using the inner `Session` in `wait_keepalive`.
     fn wait_inner(&mut self) -> Result<()> {
         let mut v = Vec::new();
-        match self.session.readline(&mut v).map(|_| ()) {
+        loop {
-            Err(Error::Io(ref e))
+            match self.session.readline(&mut v).map(|_| ()) {
-                if e.kind() == io::ErrorKind::TimedOut || e.kind() == io::ErrorKind::WouldBlock =>
+                Err(Error::Io(ref e))
-            {
+                    if e.kind() == io::ErrorKind::TimedOut
-                // we need to refresh the IDLE connection
+                        || e.kind() == io::ErrorKind::WouldBlock =>
-                self.terminate()?;
+                {
-                self.init()?;
+                    // we need to refresh the IDLE connection
-                self.wait_inner()
+                    self.terminate()?;
+                    self.init()?;
+                    return self.wait_inner();
+                }
+                r => r,
+            }?;
+
+            // Handle Dovecot's imap_idle_notify_interval message
+            if v.eq_ignore_ascii_case(b"* OK Still here\r\n") {
+                v.clear();
+            } else {
+                break Ok(());
             }
-            r => r,
         }
     }