From 3bc871e11398f67c0a59106ccaf23fa4e68ddd6f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 May 2013 14:00:18 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/lib/Net/Socket.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/program/lib/Net/Socket.php b/program/lib/Net/Socket.php
index e8a22d0..669700c 100644
--- a/program/lib/Net/Socket.php
+++ b/program/lib/Net/Socket.php
@@ -267,7 +267,12 @@
$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;
+ }
}
/**
--
Gitblit v1.9.1