diogo/xmpphp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

space fixes, added timeout to connect(), general fixes

Browse Source 
git-svn-id: svn://netflint.net/xmpphp@39 ef36c318-a008-4979-b6e8-6b496270793b
This commit is contained in:
temp 2008-05-05 21:14:43 +00:00
parent 1a4d1756c1
commit b5aa1b77b0
4 changed files with 576 additions and 571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XMPPHP/Log.php
View File

@ -69,8 +69,8 @@ class XMPPHP_Log {
* @param string $runlevel * @param string $runlevel
*/ */
public function __construct($printout = false, $runlevel = self::LEVEL_INFO) { public function __construct($printout = false, $runlevel = self::LEVEL_INFO) {
$this->runlevel = (int)$runlevel;
$this->printout = (boolean)$printout; $this->printout = (boolean)$printout;
$this->runlevel = (int)$runlevel;
} }
/** /**

11
XMPPHP/XMLStream.php
View File

@ -169,7 +169,7 @@ class XMPPHP_XMLStream {
* Cleanup connection * Cleanup connection
*/ */
public function __destruct() { public function __destruct() {
if(!$this->disconnected) { if(!$this->disconnected && $this->socket) {
$this->disconnect(); $this->disconnect();
} }
} }
@ -231,10 +231,11 @@ class XMPPHP_XMLStream {
/** /**
* Connect to XMPP Host * Connect to XMPP Host
* *
* @param integer $timeout
* @param boolean $persistent * @param boolean $persistent
* @param boolean $sendinit * @param boolean $sendinit
*/ */
public function connect($persistent = false, $sendinit = true) { public function connect($timeout = 30, $persistent = false, $sendinit = true) {
$this->disconnected = false; $this->disconnected = false;
$this->sent_disconnect = false; $this->sent_disconnect = false;
if($persistent) { if($persistent) {
@ -243,7 +244,11 @@ class XMPPHP_XMLStream {
$conflag = STREAM_CLIENT_CONNECT; $conflag = STREAM_CLIENT_CONNECT;
} }
$this->log->log("Connecting to tcp://{$this->host}:{$this->port}"); $this->log->log("Connecting to tcp://{$this->host}:{$this->port}");
$this->socket = stream_socket_client("tcp://{$this->host}:{$this->port}", $conflag); try {
$this->socket = @stream_socket_client("tcp://{$this->host}:{$this->port}", $errno, $errstr, $timeout, $conflag);
} catch (Exception $e) {
throw new XMPPHP_Exception($e->getMessage());
}
if(!$this->socket) { if(!$this->socket) {
$this->log->log("Could not connect.", XMPPHP_Log::LEVEL_ERROR); $this->log->log("Could not connect.", XMPPHP_Log::LEVEL_ERROR);
$this->disconnected = true; $this->disconnected = true;