Skip to content

Fix Folder::idle() throwing after silent periods and busy-looping on … #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mathe42 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −4
Open

Fix Folder::idle() throwing after silent periods and busy-looping on … #624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/Folder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,12 +453,22 @@ public function idle(callable $callback, int $timeout = 300): void {
// This polymorphic call is fine - Protocol::idle() will throw an exception beforehand
$line = $idle_client->getConnection()->nextLine(Response::empty());
} catch (Exceptions\RuntimeException $e) {
if(strpos($e->getMessage(), "empty response") >= 0 && $idle_client->getConnection()->connected()) {
continue;
}
if(!str_contains($e->getMessage(), "connection closed")) {
if (!str_contains($e->getMessage(), "empty response") && !str_contains($e->getMessage(), "connection closed")) {
throw $e;
}
$meta = $idle_client->getConnection()->meta();
if (($meta["timed_out"] ?? false) && !($meta["eof"] ?? true)) {
// Plain read timeout - the connection is still alive, keep waiting for the next event
continue;
}
// EOF - the server or an intermediate gateway closed the connection (e.g. after an
// inactivity timeout such as the ~30 minutes granted by RFC 2177). Re-establish the
// idle session instead of busy-looping on the dead stream.
$idle_client->getConnection()->reset();
$idle_client->connect();
$idle_client->openFolder($this->path, true);
$idle_client->getConnection()->idle();
continue;
}

if (($pos = strpos($line, "EXISTS")) !== false) {
Expand Down