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

Thomas Bruederli

2013-05-16 3bc871e11398f67c0a59106ccaf23fa4e68ddd6f

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

 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;
        }
    }

    /**