Merge branch 'master' of github.com:roundcube/roundcubemail

12 years ago · 3bc871e113
parent 31996f1508 0bd1fa5566
commit 3bc871e113
1 changed files with 6 additions and 1 deletions
--- a/program/lib/Net/Socket.php
+++ b/program/lib/Net/Socket.php
@ -267,7 +267,12 @@ class Net_Socket extends PEAR
            $this->timeout = $seconds + $microseconds/1000000;
        }

-        return stream_set_timeout($this->fp, (int) $seconds, (int) $microseconds);
+        if ($this->timeout > 0) {
+            return stream_set_timeout($this->fp, (int) $seconds, (int) $microseconds);
+        }
+        else {
+            return false;
+        }
    }

    /**