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

roundcube · May 16, 2013 · 3bc871e · 3bc871e
2 parents 31996f1 + 0bd1fa5
commit 3bc871e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/program/lib/Net/Socket.php b/program/lib/Net/Socket.php
@@ -267,7 +267,12 @@ function setTimeout($seconds = null, $microseconds = null)
             $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;
+        }
     }
 
     /**