summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-05-16 20:00:18 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-05-16 20:00:18 +0200
commit3bc871e11398f67c0a59106ccaf23fa4e68ddd6f (patch)
tree727244a2d164e7a2a7c96462e03acf83d8576758
parent31996f1508313734dd876f961631326f95503c72 (diff)
parent0bd1fa55669da70daad14914d530fdb6a0768889 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--program/lib/Net/Socket.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/program/lib/Net/Socket.php b/program/lib/Net/Socket.php
index e8a22d014..669700c1d 100644
--- 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;
+ }
}
/**